diff options
| author | Michal Čihař <michal@cihar.com> | 2017-11-29 14:51:31 +0300 |
|---|---|---|
| committer | Michal Čihař <michal@cihar.com> | 2017-11-29 14:51:31 +0300 |
| commit | 63f5b90ad53613dc4529f0711b2cf1c3a7e55d3c (patch) | |
| tree | 846c3aaf4254ae3a49890ea47861a1373ac7b005 /composer.json | |
| parent | dd38309300a129cab17d090bf30ed82cc5b44334 (diff) | |
| parent | 7bff1263c8f7dc37de9e90da1eaa38a68ff160a1 (diff) | |
Merge branch 'QA_4_7'
Diffstat (limited to 'composer.json')
| -rw-r--r-- | composer.json | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/composer.json b/composer.json index e3fc889898..82e417493d 100644 --- 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", |