Daniel Hensby 7d50e0fac7 Merge branch '3' ...

Conflicts:
	.travis.yml

2015-08-17 14:24:16 +01:00

..

batchactions

API batch restore action

2015-08-03 20:57:30 +12:00

controllers

Merge branch '3.2' into 3

2015-08-17 14:23:16 +01:00

forms

Fix auto-setting of URL from localized page titles

2015-04-29 00:16:53 +12:00

model

Merge branch '3'

2015-08-17 14:24:16 +01: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