Marc Delisle ab7942be89 Fix merge conflicts ... Signed-off-by: Marc Delisle <marc@infomarc.info>		2015-11-29 07:29:32 -05:00
..
PMA_array_test.php	Remove code duplication	2015-02-14 06:12:53 -05:00
PMA_checkPageValidity_test.php	merge db_create.php into ServerDatabasesController	2015-11-24 20:41:40 +11:00
PMA_fatalError_test.php	Remove side effects in declaration files.	2015-11-15 17:31:53 +01:00
PMA_get_real_size_test.php	Remove unneeded closing tags.	2015-07-19 00:18:38 +03:00
PMA_getLinks_test.php	Fix more method names in tests	2015-04-28 15:51:56 +05:30
PMA_getTableCount_test_dis.php	Remove side effects in declaration files.	2015-11-15 17:31:53 +01:00
PMA_headerLocation_test.php	Remove side effects in declaration files.	2015-11-15 17:31:53 +01:00
PMA_ifSetOr_test.php	Remove unneeded closing tags.	2015-07-19 00:18:38 +03:00
PMA_isValid_test.php	Remove unneeded closing tags.	2015-07-19 00:18:38 +03:00
PMA_securePath_test.php	Various coding style improvements	2013-06-11 16:27:31 +02:00
PMA_warnMissingExtension_test.php	Remove side effects in declaration files.	2015-11-15 17:31:53 +01:00