Nathan van der Werf 743252c3ff Merge branch 'develop' into feature/cleanup ... # Conflicts: # modules/backend/widgets/Form.php		2018-08-29 19:18:01 +02:00
..
importexportcontroller	Translate "Row" in _import_result_form.htm (#3574)	2018-05-31 15:14:08 -06:00
listcontroller/partials	Support for overriding list views	2016-10-29 14:10:21 +11:00
relationcontroller	Fix inflexible relation toolbar (#2760)	2017-07-04 18:56:38 -06:00
reordercontroller	Respect custom sort_order column value	2017-01-30 19:05:16 -06:00
FormController.php	Merge branch 'develop' into feature/cleanup	2018-08-29 19:18:01 +02:00
ImportExportController.php	Remove redundant variables	2018-08-15 19:23:12 +02:00
ListController.php	Remove unused imports	2018-08-24 19:51:59 +02:00
RelationController.php	Remove unused imports	2018-08-24 19:51:59 +02:00
ReorderController.php	Remove "null" assignments	2018-08-15 18:33:24 +02:00
UserPreferencesModel.php	API docs progress	2017-03-16 17:08:20 +11:00