Merge branch 'QA_4_7'

This commit is contained in:
Michal Čihař 2017-10-10 15:05:05 +02:00
commit 4249773137
3 changed files with 2 additions and 2 deletions

View File

@ -74,7 +74,6 @@ matrix:
# Default 2.0.0 Ruby is buggy
- rvm install ruby-2.3.3
- rvm --default use 2.3.3
- brew tap homebrew/php
- brew update
- brew install gettext php71 mariadb
- brew link --force gettext

View File

@ -58,6 +58,7 @@ phpMyAdmin - ChangeLog
- issue #13477 Fixed setting input transformations
- issue #13552 Fixed IPv4/IPv6 To Binary input transformation
- issue #13686 Clicking on column name to trigger sort with an active search leads to logout
- issue #13725 Fixed copying tables with specific PARTITION definition
4.7.4 (2017-08-23)
- issue #13415 Remove shadow from the logo

View File

@ -45,7 +45,7 @@
"ext-json": "*",
"ext-ctype": "*",
"ext-hash": "*",
"phpmyadmin/sql-parser": "^4.2.2",
"phpmyadmin/sql-parser": "^4.2.3",
"phpmyadmin/motranslator": "^3.0",
"phpmyadmin/shapefile": "^2.0",
"phpseclib/phpseclib": "^2.0",