Merge branch 'release/v0.7.14' into feature/react

2019-06-22 12:28:44 -07:00 · 2019-06-22 12:28:44 -07:00 · 56640253b9
commit 56640253b9
parent 2a626a3e1f c38f78df84
16 changed files with 178 additions and 59 deletions
--- a/composer.json
+++ b/composer.json
@ -30,7 +30,6 @@
        "matriphe/iso-639": "^1.2",
        "nesbot/carbon": "^1.22",
        "pragmarx/google2fa": "^5.0",
-        "pragmarx/google2fa-qrcode": "^1.0.3",
        "predis/predis": "^1.1",
        "prologue/alerts": "^0.4",
        "ramsey/uuid": "^3.7",