Merge pull request #15 from tractorcow/pulls/alias-master

Alias master as 1.0
This commit is contained in:
Simon Welsh 2014-07-11 09:21:54 +10:00
commit d50ba80512

View File

@ -13,9 +13,12 @@
"email": "sean@silverstripe.com"
}
],
"require":
{
"require": {
"silverstripe/framework": "~3.2"
},
"extra": {
"branch-alias": {
"dev-master": "1.0.x-dev"
}
}
}