diff options
| author | Mark Otto <[email protected]> | 2013-11-22 22:09:04 -0500 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-11-22 22:09:04 -0500 |
| commit | 98980b0fb2ebc813ac7cdb7b47dafd95c9d35db3 (patch) | |
| tree | 1eb37ecb58bc71628504273161dd0bb11dd4753e /composer.json | |
| parent | 37f3944bd9a1cc2b7cb2dda6f767b708daab5fc1 (diff) | |
| parent | 4c246c0117ea56cb10b91b635ff415ec20d9c97d (diff) | |
| download | bootstrap-98980b0fb2ebc813ac7cdb7b47dafd95c9d35db3.tar.xz bootstrap-98980b0fb2ebc813ac7cdb7b47dafd95c9d35db3.zip | |
Merge branch 'master' into docs_derp
Diffstat (limited to 'composer.json')
| -rw-r--r-- | composer.json | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/composer.json b/composer.json index be8ec3fc1..1638564fa 100644 --- a/composer.json +++ b/composer.json @@ -19,7 +19,7 @@ , "license": "Apache-2.0" , "extra": { "branch-alias": { - "dev-master": "3.0.x-dev" + "dev-master": "3.0.x-dev" } } } |