summaryrefslogtreecommitdiffstats
path: root/composer.json
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2019-12-02 17:00:09 +0100
committerRemi Collet <remi@remirepo.net>2019-12-02 17:00:09 +0100
commit5549c92849b708f85245127ff9cfbb86d73c3702 (patch)
treed85d21d69bcf158250806e3eab81617bf7c9d8e2 /composer.json
parenta05438f76d2f9bc5eb39865b2ed94fb0c317729c (diff)
5.0rc1
Diffstat (limited to 'composer.json')
-rw-r--r--composer.json3
1 files changed, 2 insertions, 1 deletions
diff --git a/composer.json b/composer.json
index dc1edc4..6ef2747 100644
--- a/composer.json
+++ b/composer.json
@@ -63,6 +63,7 @@
"conflict": {
"phpseclib/phpseclib": "2.0.8",
"tecnickcom/tcpdf": "<6.2",
+ "pragmarx/google2fa": ">=6.1",
"pragmarx/google2fa-qrcode": "<1.0.1",
"samyoul/u2f-php-server": "<1.1"
},
@@ -88,7 +89,7 @@
"pragmarx/google2fa-qrcode": "^1.0.1",
"samyoul/u2f-php-server": "^1.1",
"squizlabs/php_codesniffer": "^3.0",
- "tecnickcom/tcpdf": "^6.2"
+ "tecnickcom/tcpdf": "^6.3"
},
"extra": {
"branch-alias": {