Damian Mooyman 309ac0d196 Merge remote-tracking branch 'origin/3.1' into 3.2 ... Conflicts: .travis.yml admin/code/CMSProfileController.php admin/tests/LeftAndMainTest.php control/HTTP.php security/Permission.php tests/forms/FormTest.php tests/model/ArrayListTest.php tests/security/PermissionTest.php		2015-09-09 14:35:29 +12:00
..
AdminRootController.php	Update docblocks	2013-10-15 11:29:58 +13:00
CMSBatchAction.php	API Deprecate delete in favour of archive	2015-06-03 14:24:27 +12:00
CMSBatchActionHandler.php	API Deprecate delete in favour of archive	2015-06-03 14:24:27 +12:00
CMSForm.php	Remove all redundant whitespace	2014-08-19 09:17:15 +12:00
CMSMenu.php	Convert FQCNs to html safe strings	2015-07-15 15:33:00 +01: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	Update translations	2015-08-24 16:52:39 +12:00
LeftAndMain.php	Add missing packages	2015-08-24 16:15:38 +12:00
LeftAndMainExtension.php	Remove all redundant whitespace	2014-08-19 09:17:15 +12:00
MemberImportForm.php	Update translations	2015-08-24 16:52:39 +12:00
ModelAdmin.php	Merge branch '3.1' into 3.2	2015-08-18 16:39:35 +01:00
SecurityAdmin.php	Set deprecation level for all changes in 3.x to 4.0	2015-06-19 13:07:41 +12:00