Merge branch 'master' into 2fa

2025-12-31 23:39:32 +00:00 · 2019-12-26 15:07:32 +01:00 · 2019-12-26 15:07:32 +01:00 · ac0928426b
commit ac0928426b
parent 44fe58c587 042f395edd
40 changed files with 13330 additions and 5929 deletions
--- a/templates/_flash.html.twig
+++ b/templates/_flash.html.twig
@ -23,7 +23,7 @@
                    </button>
                </div>
                <div class="toast-body {{ flash_bg }}">
-                    {{ message}}
+                    {{ message | trans}}
                </div>
            </div>
        {% endfor %}