Merge branch 'QA_4_7'

This commit is contained in:
Michal Čihař 2017-07-12 16:57:11 +02:00
commit 77d035240e

View File

@ -38,7 +38,7 @@
"ext-xml": "*",
"ext-pcre": "*",
"ext-json": "*",
"phpmyadmin/sql-parser": "^4.1.7",
"phpmyadmin/sql-parser": "^4.1.9",
"phpmyadmin/motranslator": "^3.0",
"phpmyadmin/shapefile": "^2.0",
"phpseclib/phpseclib": "^2.0",