Damian Mooyman ca754eb887 Merge 3.3 into 3.4 ... # Conflicts: # admin/javascript/lang/fa_IR.js # admin/javascript/lang/it.js # admin/javascript/lang/src/fa_IR.js # admin/javascript/lang/src/it.js # lang/cs.yml # lang/eo.yml # lang/fa_IR.yml # lang/fi.yml # lang/it.yml # lang/sk.yml		2016-08-05 16:48:26 +12:00
..
AdminRootController.php	FEATURE: implement getter and setter usage for response	2015-08-29 10:24:06 +12:00
CMSBatchAction.php	API Deprecate delete in favour of archive	2015-06-03 14:24:27 +12:00
CMSBatchActionHandler.php	MINORE: Remove training whitespace.	2016-01-07 10:15:54 +13:00
CMSForm.php	Remove all redundant whitespace	2014-08-19 09:17:15 +12:00
CMSMenu.php	MINORE: Remove training whitespace.	2016-01-07 10:15:54 +13:00
CMSMenuItem.php	Remove all redundant whitespace	2014-08-19 09:17:15 +12:00
CMSPreviewable.php	Remove all redundant whitespace	2014-08-19 09:17:15 +12:00
CMSProfileController.php	Merge remote-tracking branch 'origin/3.1' into 3.2	2015-09-09 14:35:29 +12:00
GroupImportForm.php	Added 3.1.14 changelog	2015-09-15 10:58:15 +12:00
LeftAndMain.php	Merge 3.3 into 3.4	2016-08-05 16:48:26 +12:00
LeftAndMainExtension.php	Remove all redundant whitespace	2014-08-19 09:17:15 +12:00
MemberImportForm.php	Added 3.1.14 changelog	2015-09-15 10:58:15 +12:00
ModelAdmin.php	Do not hang on nested parameters in search context	2016-03-21 15:54:22 +13:00
SecurityAdmin.php	MINORE: Remove training whitespace.	2016-01-07 10:15:54 +13:00