aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Rebert <[email protected]>2013-11-05 23:36:48 -0800
committerChris Rebert <[email protected]>2013-11-05 23:36:48 -0800
commit375b9edb419a0615bb70b399eea0b81f2f0ef48f (patch)
treef35ecaa08d0cc74a3e164604d66ebbeee67c8452
parent89d489dfc701273b1898b69bde04cf5eb58b9f85 (diff)
parent7df3e142ac2e55d7967ba369002a01f4a5b3d882 (diff)
downloadbootstrap-375b9edb419a0615bb70b399eea0b81f2f0ef48f.tar.xz
bootstrap-375b9edb419a0615bb70b399eea0b81f2f0ef48f.zip
Merge pull request #11273 from benji07/patch-1
Add a branch alias
-rw-r--r--composer.json5
1 files changed, 5 insertions, 0 deletions
diff --git a/composer.json b/composer.json
index 8667ba51b..be8ec3fc1 100644
--- a/composer.json
+++ b/composer.json
@@ -17,4 +17,9 @@
"issues": "https://github.com/twbs/bootstrap/issues"
}
, "license": "Apache-2.0"
+ , "extra": {
+ "branch-alias": {
+ "dev-master": "3.0.x-dev"
+ }
+ }
}