Merge branch 'QA_4_7'

2017-11-29 12:51:31 +01:00 · 2017-11-29 12:51:31 +01:00 · 63f5b90ad5
commit 63f5b90ad5
parent dd38309300 7bff1263c8
1 changed files with 2 additions and 1 deletions
--- a/composer.json
+++ b/composer.json
@ -48,7 +48,7 @@
        "phpmyadmin/sql-parser": "^4.2.3",
        "phpmyadmin/motranslator": "^3.0",
        "phpmyadmin/shapefile": "^2.0",
-        "phpseclib/phpseclib": "^2.0,<2.0.8",
+        "phpseclib/phpseclib": "^2.0",
        "google/recaptcha": "^1.1",
        "psr/container": "^1.0",
        "twig/twig": "^1.32",
@ -57,6 +57,7 @@
        "symfony/polyfill-mbstring": "^1.3"
    },
    "conflict": {
+        "phpseclib/phpseclib": "2.0.8",
        "tecnickcom/tcpdf": "<6.2",
        "pragmarx/google2fa": "<2.0",
        "bacon/bacon-qr-code": "<1.0",