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

@ -21,6 +21,7 @@
"ocramius/proxy-manager": "2.1.*",
"omines/datatables-bundle": "^0.3.1",
"r/u2f-two-factor-bundle": "^0.7.0",
"php-translation/symfony-bundle": "^0.9.1",
"s9e/text-formatter": "^2.1",
"scheb/two-factor-bundle": "^4.11",
"sensio/framework-extra-bundle": "^5.1",