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

@ -23,4 +23,5 @@ return [
Doctrine\Bundle\DoctrineCacheBundle\DoctrineCacheBundle::class => ['all' => true],
Scheb\TwoFactorBundle\SchebTwoFactorBundle::class => ['all' => true],
R\U2FTwoFactorBundle\RU2FTwoFactorBundle::class => ['all' => true],
Translation\Bundle\TranslationBundle::class => ['all' => true],
];