Merge remote-tracking branch 'origin/master' into 2.6.0

2022-10-18 11:11:02 +02:00
parent e422921fab 3340262707
commit c372d68cc1
32 changed files with 691 additions and 432 deletions
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Tag/tags.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Tag/tags.html.twig
@ -36,8 +36,4 @@
            {% endfor %}
        </ul>
    </div>
-
-    <div>
-
-    </div>
 {% endblock %}