Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 48b95ece85a149e72a2a5e9d2699d869a60a6fa7 https://github.com/phpmyadmin/phpmyadmin/commit/48b95ece85a149e72a2a5e9d2699... Author: Michal Čihař michal@cihar.com Date: 2017-09-04 (Mon, 04 Sep 2017)

Changed paths: M test/classes/DisplayResultsTest.php

Log Message: ----------- Adjust tests to new attributes

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

Commit: b7b4c413250ba030f7a89cc876c69ab18db84b92 https://github.com/phpmyadmin/phpmyadmin/commit/b7b4c413250ba030f7a89cc876c6... Author: Michal Čihař michal@cihar.com Date: 2017-09-04 (Mon, 04 Sep 2017)

Changed paths: M test/classes/DisplayResultsTest.php

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

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/3163ad318133...b7b4c413250b