Merge branch 'master' into log_system

This commit is contained in:
Jan Böhmer 2020-01-26 12:09:45 +01:00
commit d6c6b973bf

View file

@ -1,5 +1,5 @@
controllers: controllers:
resource: Controller/ resource: ../../src/Controller/
type: annotation type: annotation
prefix: '{_locale}' prefix: '{_locale}'