silverstripe-cms/code
Ingo Schommer 8eb3840325 Merge remote-tracking branch 'origin/3.1'
Conflicts:
	code/controllers/ReportAdmin.php
	code/reports/Report.php
	tests/reports/CmsReportsTest.php
2013-03-26 10:58:07 +01:00
..
batchactions Method visibility according to coding conventions 2012-09-20 10:41:50 +02:00
controllers Merge remote-tracking branch 'origin/3.1' 2013-03-26 10:58:07 +01:00
forms API Marked statics private, use Config API instead (#8317) 2013-03-24 17:21:04 +01:00
model API Marked statics private, use Config API instead (#8317) 2013-03-24 17:21:04 +01:00
reports API Marked statics private, use Config API instead (#8317) 2013-03-24 17:21:04 +01:00
search API Marked statics private, use Config API instead (#8317) 2013-03-24 17:21:04 +01:00
staticpublisher API Marked statics private, use Config API instead (#8317) 2013-03-24 17:21:04 +01:00