Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 504b80adbf7a2c614b92dbe467dcc91198f7a45a https://github.com/phpmyadmin/phpmyadmin/commit/504b80adbf7a2c614b92dbe467dc... Author: Marc Delisle <marc@infomarc.info> Date: 2015-05-07 (Thu, 07 May 2015) Changed paths: M test/bootstrap-dist.php M test/libraries/rte/PMA_RTN_getExecuteForm_test.php M test/libraries/rte/PMA_TRI_getEditorForm_test.php Log Message: ----------- phpunit 4.2: assertTag is deprecated Signed-off-by: Marc Delisle <marc@infomarc.info> Commit: 5d9a7a748cc378351b8ec22ecd0a6bcb6836a15e https://github.com/phpmyadmin/phpmyadmin/commit/5d9a7a748cc378351b8ec22ecd0a... Author: Marc Delisle <marc@infomarc.info> Date: 2015-05-07 (Thu, 07 May 2015) Changed paths: M test/bootstrap-dist.php M test/libraries/rte/PMA_RTN_getExecuteForm_test.php M test/libraries/rte/PMA_TRI_getEditorForm_test.php Log Message: ----------- Fix merge conflicts Signed-off-by: Marc Delisle <marc@infomarc.info> Commit: 6dd341f5c501ba3dd54719f0794b849c28c016d4 https://github.com/phpmyadmin/phpmyadmin/commit/6dd341f5c501ba3dd54719f0794b... Author: Marc Delisle <marc@infomarc.info> Date: 2015-05-07 (Thu, 07 May 2015) Changed paths: M test/libraries/PMA_central_columns_test.php Log Message: ----------- phpunit 4.2: assertTag is deprecated Signed-off-by: Marc Delisle <marc@infomarc.info> Compare: https://github.com/phpmyadmin/phpmyadmin/compare/a5398611f706...6dd341f5c501