Merge branch 'master' into 2fa

This commit is contained in:
Jan Böhmer 2019-12-26 15:07:32 +01:00
commit ac0928426b
40 changed files with 13330 additions and 5929 deletions

View file

@ -0,0 +1,6 @@
_translation_webui:
resource: "@TranslationBundle/Resources/config/routing_webui.yml"
prefix: /admin
_translation_profiler:
resource: '@TranslationBundle/Resources/config/routing_symfony_profiler.yml'

View file

@ -0,0 +1,3 @@
_translation_edit_in_place:
resource: '@TranslationBundle/Resources/config/routing_edit_in_place.yml'
prefix: /admin