Damian Mooyman 7ee444e08a Merge remote-tracking branch 'origin/3.1' into 3.2 ... Conflicts: admin/code/LeftAndMain.php control/injector/SilverStripeServiceConfigurationLocator.php core/ClassInfo.php filesystem/File.php model/DataObject.php model/DataQuery.php search/filters/FulltextFilter.php search/filters/SearchFilter.php tests/core/ClassInfoTest.php tests/filesystem/FileTest.php tests/model/DataListTest.php		2015-07-31 11:38:18 +12:00
..
ArrayData.php	Add codesniffer that ensures indentation is with tabs.	2012-12-12 17:33:31 +13:00
GenericTemplateGlobalProvider.php	FIX Remove instances of lines longer than 120c	2012-09-30 17:18:13 +13:00
Requirements.php	Fix missing media parameter on Requirements::combine_files	2015-05-11 17:30:59 +12:00
SSTemplateParser.php	Merge remote-tracking branch 'origin/3.1' into 3	2015-03-31 19:54:15 +13:00
SSTemplateParser.php.inc	Merge remote-tracking branch 'origin/3.1' into 3	2015-03-31 19:54:15 +13:00
SSViewer.php	Merge remote-tracking branch 'origin/3.1' into 3.2	2015-07-31 11:38:18 +12:00
TemplateGlobalProvider.php	FIX Remove instances of lines longer than 120c	2012-09-30 17:18:13 +13:00
TemplateIteratorProvider.php	Remove end php tag from TemplateIteratorProvider	2012-10-10 11:15:55 +13:00
TemplateParser.php	Feature to allow that changing the SSTemplateParser through the Injector system	2013-10-18 12:42:39 +13:00
ViewableData.php	NEW ViewableData_Debugger implements __toString	2015-03-24 10:40:25 +00:00