Isaac Bennetch 014f769718 Fix more merge conflicts ... Signed-off-by: Isaac Bennetch <bennetch@gmail.com>		2020-10-09 22:19:46 -04:00
..
ChangePassword.php	Remove PMA_ from PMA_commonParams and PMA_commonActions names	2019-05-21 00:18:44 -03:00
CreateTable.php	Remove libraries/check_user_privileges.inc.php	2019-01-22 18:18:21 -02:00
Error.php	Fix twig imports using old PSR-1 style	2020-06-14 22:55:55 +02:00
Export.php	Fix twig imports using old PSR-1 style	2020-06-14 22:55:55 +02:00
GitRevision.php	Fix a merge issue reported by Scrutinizer	2019-11-22 23:50:37 +01:00
Import.php	Remove Charsets::getCharsetDropdownBox method	2019-06-25 01:45:32 -03:00
ImportAjax.php	Fix doc comments alignment	2019-01-07 15:09:32 -02:00
Results.php	Fix more merge conflicts	2020-10-09 22:19:46 -04:00