Merge branch 'develop' into feature/vuejs

2019-05-01 20:57:49 -07:00 · 2019-05-01 20:57:49 -07:00 · 5c99cae779
commit 5c99cae779
parent c80c8564b8 3290d39863
8 changed files with 187 additions and 30 deletions
--- a/composer.json
+++ b/composer.json
@ -29,7 +29,8 @@
        "lord/laroute": "^2.4",
        "matriphe/iso-639": "^1.2",
        "nesbot/carbon": "^1.22",
-        "pragmarx/google2fa": "^2.0",
+        "pragmarx/google2fa": "^5.0",
+        "pragmarx/google2fa-qrcode": "^1.0.3",
        "predis/predis": "^1.1",
        "prologue/alerts": "^0.4",
        "ramsey/uuid": "^3.7",