Merge branch '4'

# Conflicts:
#	composer.json
This commit is contained in:
Daniel Hensby 2018-07-30 11:19:07 +01:00
commit d5bb6e7348
No known key found for this signature in database
GPG Key ID: D8DEBC4C8E7BC8B9
1 changed files with 1 additions and 0 deletions

View File

@ -14,6 +14,7 @@ Provided by [silverstripe/recipe-cms]:
* [admin](http://github.com/silverstripe/silverstripe-admin)
* [asset-admin](http://github.com/silverstripe/silverstripe-asset-admin)
* [campaign-admin](http://github.com/silverstripe/silverstripe-campaign-admin)
* [versioned-admin](http://github.com/silverstripe/silverstripe-versioned-admin)
* [cms](http://github.com/silverstripe/silverstripe-cms)
* [errorpage](http://github.com/silverstripe/silverstripe-errorpage)
* [reports](http://github.com/silverstripe/silverstripe-reports)