Merge remote branch 'origin/master' into translation-staging

This commit is contained in:
TeamCity 2012-11-02 07:28:51 +13:00
commit 76d26a75e2

22
composer.json Normal file
View File

@ -0,0 +1,22 @@
{
"name": "silverstripe/framework",
"type": "silverstripe-module",
"description": "The SilverStripe framework",
"homepage": "http://silverstripe.org",
"license": "BSD-3-Clause",
"keywords": ["silverstripe", "framework"],
"authors": [
{
"name": "SilverStripe",
"homepage": "http://silverstripe.com"
},
{
"name": "The SilverStripe Community",
"homepage": "http://silverstripe.org"
}
],
"require": {
"php": ">=5.3.2",
"composer/installers": "*"
}
}