Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: d2ea090c2e831a65404b9e32b7af574eba75d2ae https://github.com/phpmyadmin/phpmyadmin/commit/d2ea090c2e831a65404b9e32b7af... Author: Michal Čihař michal@cihar.com Date: 2018-01-08 (Mon, 08 Jan 2018)

Changed paths: M ChangeLog M libraries/DatabaseInterface.php

Log Message: ----------- Fixed fallback value for collation connection.

Fixes #13758

Signed-off-by: Michal Čihař michal@cihar.com

Commit: 3ed17858c7975ed67bfb520d01c33043cdadd2e7 https://github.com/phpmyadmin/phpmyadmin/commit/3ed17858c7975ed67bfb520d01c3... Author: Michal Čihař michal@cihar.com Date: 2018-01-08 (Mon, 08 Jan 2018)

Changed paths: M ChangeLog

Log Message: ----------- Merge branch 'QA_4_7'

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/e9ec1388d0f7...3ed17858c797