Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 73d067a540cb5ccc14209ce9f1eda69ba98555b5 https://github.com/phpmyadmin/phpmyadmin/commit/73d067a540cb5ccc14209ce9f1ed... Author: Michal Čihař michal@cihar.com Date: 2016-06-15 (Wed, 15 Jun 2016)

Changed paths: M test/libraries/PMA_user_preferences_test.php

Log Message: ----------- Fix test for new redirect code

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

Commit: 8af7b7e48afd08f6bf4f404ebc4c1aefe43b7537 https://github.com/phpmyadmin/phpmyadmin/commit/8af7b7e48afd08f6bf4f404ebc4c... Author: Michal Čihař michal@cihar.com Date: 2016-06-15 (Wed, 15 Jun 2016)

Changed paths: M test/libraries/PMA_user_preferences_test.php

Log Message: ----------- Merge branch 'QA_4_6'

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/9b7a6967a804...8af7b7e48afd