Merge remote-tracking branch 'origin/QA_4_7' into QA_4_7

This commit is contained in:
Weblate 2017-11-29 12:52:07 +01:00
commit c6f3c4002c

View File

@ -42,9 +42,12 @@
"phpmyadmin/motranslator": "^3.0",
"phpmyadmin/shapefile": "^2.0",
"tecnickcom/tcpdf": "^6.2",
"phpseclib/phpseclib": "^2.0,<2.0.8",
"phpseclib/phpseclib": "^2.0",
"google/recaptcha": "^1.1"
},
"conflict": {
"phpseclib/phpseclib": "2.0.8"
},
"suggest": {
"ext-openssl": "Cookie encryption",
"ext-curl": "Updates checking",