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:
authorWilliam Desportes <williamdes@wdes.fr>2020-11-13 11:52:58 +0300
committerWilliam Desportes <williamdes@wdes.fr>2020-11-13 11:52:58 +0300
commitd7a27c33556fd8f41312b6dd83b33c72abb7fe21 (patch)
tree72d2acef76c9be52c6a725ca3f9f1d4f1e412bfd /composer.json
parentbb3082b0f5165ef45d693f497c6c0104d21c9ee5 (diff)
#16407 - Make all versions of pragmarx/google2fa below 6.1.0 incompatible
Because of this commit: https://github.com/antonioribeiro/google2fa/commit/c1bb594de16107210142148d2961c107ae06737f Fixed the tests for newer versions. Signed-off-by: William Desportes <williamdes@wdes.fr>
Diffstat (limited to 'composer.json')
-rw-r--r--composer.json2
1 files changed, 1 insertions, 1 deletions
diff --git a/composer.json b/composer.json
index b35da4a926..f133581a78 100644
--- a/composer.json
+++ b/composer.json
@@ -63,7 +63,7 @@
"conflict": {
"phpseclib/phpseclib": "2.0.8",
"tecnickcom/tcpdf": "<6.2",
- "pragmarx/google2fa": ">8.0",
+ "pragmarx/google2fa": "<6.1.0 || >8.0",
"pragmarx/google2fa-qrcode": "<1.0.1",
"samyoul/u2f-php-server": "<1.1"
},