Merge pull request #11273 from benji07/patch-1

Add a branch alias
This commit is contained in:
Chris Rebert 2013-11-05 23:36:48 -08:00
commit 375b9edb41

View File

@ -17,4 +17,9 @@
"issues": "https://github.com/twbs/bootstrap/issues"
}
, "license": "Apache-2.0"
, "extra": {
"branch-alias": {
"dev-master": "3.0.x-dev"
}
}
}