Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 763683b4fe444b573185f729a8b9537a72a26404 https://github.com/phpmyadmin/phpmyadmin/commit/763683b4fe444b573185f729a8b9... Author: Michal Čihař <michal@cihar.com> Date: 2016-06-09 (Thu, 09 Jun 2016) Changed paths: M test/classes/plugin/export/ExportJsonTest.php Log Message: ----------- Fix test expectations Signed-off-by: Michal Čihař <michal@cihar.com> Commit: c70aed7a1d0968a344ae7384db663f8459052dcd https://github.com/phpmyadmin/phpmyadmin/commit/c70aed7a1d0968a344ae7384db66... Author: Michal Čihař <michal@cihar.com> Date: 2016-06-09 (Thu, 09 Jun 2016) Changed paths: M test/classes/plugin/export/ExportJsonTest.php Log Message: ----------- Merge branch 'QA_4_6' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/62d417db9b3a...c70aed7a1d09