Damian Mooyman b291306c03 Merge remote-tracking branch 'origin/4.1' into 4 ... # Conflicts: # client/dist/js/bundle.js		2018-02-15 09:24:08 +13:00
..
CurrentPageIdentifier.php	Auto-convert to psr2	2017-01-31 13:59:35 +13:00
RedirectorPage.php	Merge branch '3'	2017-06-28 15:21:22 +01:00
RedirectorPageController.php	FIX Allow RedirectorPage to have non-redirected actions, move redirection to index	2017-06-23 11:23:31 +12:00
SiteTree.php	Merge pull request #2093 from open-sausages/pulls/4.1/mind-if-i-button	2018-02-12 10:47:14 +13:00
SiteTreeExtension.php	Auto-convert to psr2	2017-01-31 13:59:35 +13:00
SiteTreeFileExtension.php	File Form missing CMS Usage information	2018-01-16 15:48:15 +13:00
SiteTreeFileFormFactoryExtension.php	Remove passing in record	2018-02-14 14:00:04 +13:00
SiteTreeFolderExtension.php	Update usages of ClassInfo	2017-09-20 15:20:17 +12:00
SiteTreeLinkTracking_Parser.php	BUG Safely check for is_site_url before parsing a shortcode	2017-10-30 14:38:31 +13:00
SiteTreeLinkTracking.php	Fix and upgrade all tests	2017-06-21 16:29:40 +12:00
VirtualPage.php	Automatic linting fixes	2017-12-19 10:31:25 +13:00