silverstripe-cms/code
Ingo Schommer 8ab66c93b6 Merge remote-tracking branch 'origin/3.1'
Conflicts:
	code/reports/Report.php
	composer.json
2013-01-21 11:24:05 +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-01-21 11:24:05 +01:00
forms Merge branch '3.0' 2012-11-22 23:48:18 +01:00
model Merge remote-tracking branch 'origin/3.0' into 3.1 2013-01-21 10:03:30 +01:00
reports API: moved reports API to separate module 2013-01-17 21:58:03 +13:00
search Method visibility according to coding conventions 2012-09-20 10:41:50 +02:00
staticpublisher ENHANCEMENT Writing caching metadata as HTML comments in FilesystemPublisher (through StaticPublisher::$include_caching_metadata) (ischommer) 2013-01-14 17:08:12 +01:00