Merge branch 'master' into log_system

This commit is contained in:
Jan Böhmer 2020-01-26 16:21:36 +01:00
commit 4ddc9251d1
5 changed files with 6287 additions and 7 deletions

View file

@ -1,5 +1,5 @@
translation:
locales: ["en", "de"]
locales: ["en", "de", "ru"]
edit_in_place:
enabled: false
config_name: app

View file

@ -13,3 +13,4 @@ twig:
default_currency: '%default_currency%'
global_theme: '%global_theme%'
allow_email_pw_reset: '%allow_email_pw_reset%'
locale_menu: '%locale_menu%'