mirror of
https://github.com/silverstripe/silverstripe-framework
synced 2024-09-28 12:26:23 +02:00
Merge remote-tracking branch 'origin/2.4' into 3.0
Conflicts: README.md composer.json docs/en/installation/from-source.md docs/en/misc/contributing.md model/Database.php
This commit is contained in:
commit
79cf1faf53
@ -1,6 +1,6 @@
|
||||
## SilverStripe Framework
|
||||
|
||||
[![Build Status](https://secure.travis-ci.org/silverstripe/sapphire.png?branch=3.0)](https://travis-ci.org/silverstripe/sapphire)
|
||||
[![Build Status](https://secure.travis-ci.org/silverstripe/silverstripe-framework.png?branch=3.0)](https://travis-ci.org/silverstripe/silverstripe-framework)
|
||||
|
||||
PHP5 framework forming the base for the SilverStripe CMS ([http://silverstripe.org](http://silverstripe.org)).
|
||||
Requires a [`silverstripe-installer`](http://github.com/silverstripe/silverstripe-installer) base project. Typically used alongside the [`cms`](http://github.com/silverstripe/silverstripe-cms) module.
|
||||
|
Loading…
Reference in New Issue
Block a user