Merge QA_4_7 changes from releasing 4.7.4; fix merge conflicts

Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
This commit is contained in:
Isaac Bennetch 2017-08-24 11:00:00 -04:00
commit ce53eb1064
2 changed files with 2274 additions and 1 deletions

View File

@ -33,7 +33,9 @@ phpMyAdmin - ChangeLog
- issue #13408 Show MySQL warnings when executing SQL queries
- issue #5827 Allow Designer to show tables from other databases
4.7.4 (not yet released)
4.7.5 (not yet released)
4.7.4 (2017-08-23)
- issue #13415 Remove shadow from the logo
- issue #13507 Fixed per server theme feature
- issue #13523 Missing newline in ALTER exports

2271
composer.lock generated Normal file

File diff suppressed because it is too large Load Diff