Damian Mooyman 7c13f7f75f Merge 3.4 into 3 ... # Conflicts: # code/controllers/CMSPageHistoryController.php		2016-08-05 19:14:57 +12:00
..
batchactions	MINOR: Remove training whitespace.	2016-01-07 10:32:05 +13:00
controllers	Merge 3.4 into 3	2016-08-05 19:14:57 +12:00
forms	Added readonly version of SiteTreeURLSegmentFiled, small quality of life thing when a user is looking at readonly data and wants to easily view the frontend of that page.	2016-03-15 10:48:46 +11:00
model	FIX do not show HiddenClass pages in allowed children (#1555)	2016-07-22 09:45:14 +01:00
reports	Merge 3.1 into 3.2	2016-04-26 00:09:19 +01:00
search	MINOR: Remove training whitespace.	2016-01-07 10:32:05 +13:00