Mateusz Uzdowski 52d297e6ef Merge remote-tracking branch 'origin/3.1' into merge-back ... Conflicts: code/controllers/CMSSiteTreeFilter.php code/controllers/ReportAdmin.php code/reports/Report.php		2014-08-13 17:19:01 +12:00
..
CurrentPageIdentifier.php	Method visibility according to coding conventions	2012-09-20 10:41:50 +02:00
ErrorPage.php	API Update ErrorPage to respect new HTTP Error codes	2014-05-06 15:29:33 +12:00
RedirectorPage.php	Support for protocol relative RedirectorPage.ExternalURL	2014-05-30 00:01:45 +12:00
SiteTree.php	Merge remote-tracking branch 'origin/3.1' into merge-back	2014-08-13 17:19:01 +12:00
SiteTreeExtension.php	API Added SiteTreeExtension::updateRelativeLink	2013-05-10 12:22:22 +12:00
SiteTreeFileExtension.php	API Move of codebase to parameterised query database abstraction layer	2014-07-07 15:07:37 +12:00
SiteTreeFolderExtension.php	API Move of codebase to parameterised query database abstraction layer	2014-07-07 15:07:37 +12:00
SiteTreeLinkTracking.php	Merge remote-tracking branch 'origin/3.1'	2014-05-06 10:24:28 +12:00
VirtualPage.php	Merge remote-tracking branch 'origin/3.1' into merge-back	2014-08-13 17:19:01 +12:00