diff options
| author | Mark Otto <[email protected]> | 2013-12-14 16:29:47 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-12-14 16:29:47 -0800 |
| commit | 323a40cc53dabf0561c588c8f8ccd690c5bb0a03 (patch) | |
| tree | 0f4ab3c35f65a6f88a8b4a8a28001650cdf4ae7a /composer.json | |
| parent | 89e0f1669f2b4166051affa4eec819475660ed72 (diff) | |
| parent | 83c60ef3eec234b3dac94c841fd1f13f94aab36f (diff) | |
| download | bootstrap-323a40cc53dabf0561c588c8f8ccd690c5bb0a03.tar.xz bootstrap-323a40cc53dabf0561c588c8f8ccd690c5bb0a03.zip | |
Merge branch 'master' into pr/11162
Conflicts:
less/modals.less
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" + } + } } |