tonyair
/
silverstripe-cms
mirror of https://github.com/silverstripe/silverstripe-cms
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/3.1' 

Conflicts:
	composer.json
This commit is contained in:
Ingo Schommer 2012-12-14 11:05:33 +01:00
parent 343f2512d3 4cd166a111
commit bb0633fffc
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
composer.json
View File

@ -18,7 +18,7 @@
"require": {
"php": ">=5.3.2",
"composer/installers": "*",
"silverstripe/framework": "dev-master"
"silverstripe/framework": "3.2.x-dev"
},
"extra": {
"branch-alias": {