silverstripe-framework/view
Ingo Schommer 3b02d22989 Merge remote-tracking branch 'origin/3.0' into 3.1
Conflicts:
	dev/CsvBulkLoader.php
2013-05-09 10:34:20 +02: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 Removed stray ampersand in Requirements (fixes #1809) 2013-04-30 00:35:25 +02:00
SSTemplateParser.php MINOR: if no doctyle is set, include comments inside <html> 2013-04-22 18:16:09 +00:00
SSTemplateParser.php.inc MINOR: if no doctyle is set, include comments inside <html> 2013-04-22 18:16:09 +00:00
SSViewer.php FIX Config isolation in Director::test() 2013-04-07 23:59:10 +02: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
ViewableData.php Merge remote-tracking branch 'origin/3.0' into 3.1 2013-05-09 10:34:20 +02:00