diff options
| author | Mark Otto <[email protected]> | 2013-12-14 16:20:19 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-12-14 16:20:19 -0800 |
| commit | 83c60ef3eec234b3dac94c841fd1f13f94aab36f (patch) | |
| tree | 0d896dedbbd47723ab769b139b63a5a58778e578 /composer.json | |
| parent | 3bfa630d2afe70452861b2466daab78daa47dda8 (diff) | |
| parent | 4afcebe0e71aafd0cfb501548a6591effdbe2e70 (diff) | |
| download | bootstrap-83c60ef3eec234b3dac94c841fd1f13f94aab36f.tar.xz bootstrap-83c60ef3eec234b3dac94c841fd1f13f94aab36f.zip | |
Merge branch 'master' into pr/11107
Conflicts:
docs-assets/js/raw-files.js
Diffstat (limited to 'composer.json')
| -rw-r--r-- | composer.json | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/composer.json b/composer.json index 8667ba51b..1638564fa 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" + } + } } |