silverstripe-cms/code
Simon Welsh b497b8f548 Merge remote-tracking branch 'origin/3.1'
Conflicts:
	.travis.yml
	code/reports/Report.php
2014-03-18 09:23:39 +13:00
..
batchactions Method visibility according to coding conventions 2012-09-20 10:41:50 +02:00
controllers Merge remote-tracking branch 'origin/3.1' 2014-03-18 09:23:39 +13:00
forms Numerous PHPDoc fixes. 2014-02-10 15:35:13 -05:00
model Merge remote-tracking branch 'origin/3.1' 2014-03-18 09:23:39 +13:00
reports FIX: Reports with Parameter fields override ReportTitle and ReportDescription 2014-03-16 19:09:47 +13:00
search FIX: Rename search locale variable to avoid conflicts with locale switcher. 2013-05-11 19:31:02 +12:00