Samuel Georges a548d6ee56 Merge remote-tracking branch 'remotes/origin/stable' into develop ... Conflicts: modules/backend/lang/en/lang.php modules/backend/lang/fr/lang.php		2016-04-01 13:00:32 +11:00
..
importexportcontroller	Tidy up some logic, restore firstRowTitles setting	2016-03-26 14:10:05 +11:00
relationcontroller	Switch the manage popup title according to the button pressed	2016-03-25 14:03:11 +11:00
reordercontroller	Allow the model attribute name to be specified from config	2015-08-22 16:39:09 +10:00
FormController.php	Allow CmsObjects to define their own Twig cache key	2016-03-21 13:42:03 +11:00
ImportExportController.php	Merge remote-tracking branch 'remotes/origin/stable' into develop	2016-04-01 13:00:32 +11:00
ListController.php	Merge branch 'develop' into stable	2016-02-27 14:55:52 +11:00
RelationController.php	Share pivot|list title logic	2016-03-25 14:24:38 +11:00
ReorderController.php	Add support to extend query on 'nested' sortMode - refs #1519	2015-10-17 12:44:16 +11:00
UserPreferencesModel.php	(Rollback) Keep instances to themselves	2016-03-25 14:17:13 +11:00