Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 81821574b196262742f858ae0560ec64fef4954c https://github.com/phpmyadmin/phpmyadmin/commit/81821574b196262742f858ae0560... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2016-02-23 (Tue, 23 Feb 2016)

Changed paths: M test/classes/SanitizeTest.php R test/libraries/PMA_escapeJsString_test.php

Log Message: ----------- Merge test files since they both test the same class

Signed-off-by: Madhura Jayaratne madhura.cj@gmail.com