Isaac Bennetch 93c93bc9ee Fix merge conflicts ... Signed-off-by: Isaac Bennetch <bennetch@gmail.com>		2020-10-09 22:14:49 -04:00
..
Database	Fix #15722 - Get Database structure fails with PHP error on replicated server	2019-12-30 17:37:49 +01:00
Server	Fix twig imports using old PSR-1 style	2020-06-14 22:55:55 +02:00
Setup	Merge branch 'QA_4_9' into QA_5_0	2019-09-21 12:51:04 -03:00
Table	Fix merge conflicts	2020-10-09 22:14:49 -04:00
AbstractController.php	Define controllers as services in an external configuration file	2019-05-19 01:54:44 +02:00
AjaxController.php	Reference class names in use statements	2019-06-12 00:14:26 -03:00
BrowseForeignersController.php	Define controllers as services in an external configuration file	2019-05-19 01:54:44 +02:00
HomeController.php	Remove Charsets::getCollationDropdownBox method	2019-06-25 03:32:01 -03:00
TransformationOverviewController.php	Define controllers as services in an external configuration file	2019-05-19 01:54:44 +02:00