Merge 3.2 into 3.3

This commit is contained in:
Daniel Hensby 2016-04-26 02:04:36 +01:00
commit 1c1b277c93
No known key found for this signature in database
GPG Key ID: E38EC566FE29EB66

View File

@ -4,6 +4,7 @@ Base project folder for a SilverStripe ([http://silverstripe.org](http://silvers
* [`framework`](http://github.com/silverstripe/silverstripe-framework): Module including the base framework
* [`cms`](http://github.com/silverstripe/silverstripe-cms): Module including a Content Management System
* [`siteconfig`](http://github.com/silverstripe/silverstripe-siteconfig): Module providing a Settings tab in the admin section allowing users to set site wide global configuration.
* `themes/simple` (optional)
## Installation ##