diff options
| author | Mark Otto <[email protected]> | 2013-12-18 16:19:46 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-12-18 16:19:46 -0800 |
| commit | 07705673b6398ae9cfe2cb59b97d61e04efeb8bf (patch) | |
| tree | 4f105edd66b0c13a8a99a636b4aef0bb640b883d /composer.json | |
| parent | bc265ac64798c01b2f35ca48ef1a65025e0c71b5 (diff) | |
| parent | 3315d4d9f4c47e67f1d1c9f6a0b262a5d8b688bd (diff) | |
| download | bootstrap-07705673b6398ae9cfe2cb59b97d61e04efeb8bf.tar.xz bootstrap-07705673b6398ae9cfe2cb59b97d61e04efeb8bf.zip | |
Merge branch 'master' into docs_derp
Conflicts:
_layouts/default.html
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 1638564fa..81d7ef85d 100644 --- a/composer.json +++ b/composer.json @@ -16,7 +16,7 @@ , "support": { "issues": "https://github.com/twbs/bootstrap/issues" } - , "license": "Apache-2.0" + , "license": "MIT" , "extra": { "branch-alias": { "dev-master": "3.0.x-dev" |