Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/phpmyadmin/phpmyadmin.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Čihař <michal@cihar.com>2018-03-16 12:52:49 +0300
committerMichal Čihař <michal@cihar.com>2018-03-16 12:52:49 +0300
commitadf30f161c79acdd8924a3b90ae6cbc76bf8053f (patch)
tree3ecbfc3f9fc54a48b4b2961d06f6bb6aad8d6ab5 /composer.json
parent0c2132180366569c9246b45a6ab82642b3119716 (diff)
Update to pragmarx/google2fa 3.0.1
This has changed license to MIT making it compatible with our GPL2. Fixes #14074 Signed-off-by: Michal Čihař <michal@cihar.com>
Diffstat (limited to 'composer.json')
-rw-r--r--composer.json4
1 files changed, 2 insertions, 2 deletions
diff --git a/composer.json b/composer.json
index 65be479480..b47af228b6 100644
--- a/composer.json
+++ b/composer.json
@@ -60,7 +60,7 @@
"conflict": {
"phpseclib/phpseclib": "2.0.8",
"tecnickcom/tcpdf": "<6.2",
- "pragmarx/google2fa": "<2.0",
+ "pragmarx/google2fa": "<3.0.1",
"bacon/bacon-qr-code": "<1.0",
"samyoul/u2f-php-server": "<1.1"
},
@@ -84,7 +84,7 @@
"phpunit/phpunit-selenium": "~1.2 || ^3.0",
"squizlabs/php_codesniffer": "^3.0",
"tecnickcom/tcpdf": "^6.2",
- "pragmarx/google2fa": "^2.0",
+ "pragmarx/google2fa": "^3.0",
"bacon/bacon-qr-code": "^1.0",
"samyoul/u2f-php-server": "^1.1",
"phpmyadmin/coding-standard": "^0.3"