silverstripe-cms/code
Damian Mooyman 3790273ae7 Merge remote-tracking branch 'origin/3'
Conflicts:
	composer.json
2015-07-31 15:49:46 +12:00
..
batchactions FIX: explicitly call get functions for site tree checks 2015-06-05 11:09:23 +12:00
controllers Merge remote-tracking branch 'origin/3.2' into 3 2015-07-31 14:34:04 +12:00
forms Fix auto-setting of URL from localized page titles 2015-04-29 00:16:53 +12:00
model Merge remote-tracking branch 'origin/3' 2015-07-31 15:49:46 +12:00
reports Merge branch '3.1' into 3.2 2015-07-20 11:09:29 +01:00
search Merge remote-tracking branch 'origin/3.1' into 3 2015-06-02 19:23:48 +12:00