Damian Mooyman d7d6fd8758 Merge 3 into master ... # Conflicts: # code/controllers/CMSPageAddController.php # code/model/ErrorPage.php # composer.json # css/screen.css # tests/behat/features/insert-a-link.feature		2016-04-29 14:34:29 +12:00
..
CurrentPageIdentifier.php	Cleanup trailing whitespace	2016-03-09 10:28:45 +13:00
ErrorPage.php	FIX for #1447 to ensure proper type-safe checking of file_put_contents() in ErrorPage->writeStaticPage()	2016-04-06 17:34:55 -07:00
RedirectorPage.php	Adjust file paths for new static file structure in framework	2016-04-20 21:13:20 +12:00
SiteTree.php	Merge 3 into master	2016-04-29 14:34:29 +12:00
SiteTreeExtension.php	API Support renamed Versioned API	2016-04-01 16:17:47 +13:00
SiteTreeFileExtension.php	API Update link tracking for image shortcodes	2016-03-21 09:08:31 +13:00
SiteTreeFolderExtension.php	Cleanup trailing whitespace	2016-03-09 10:28:45 +13:00
SiteTreeLinkTracking.php	Merge 3 into master	2016-04-29 14:34:29 +12:00
VirtualPage.php	API Update to use new Versioned API	2016-03-17 13:44:26 +13:00