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 /CONTRIBUTING.md | |
| 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 'CONTRIBUTING.md')
| -rw-r--r-- | CONTRIBUTING.md | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 21062d9f1..c8b40a07b 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -59,9 +59,7 @@ We only accept issues that are bug reports or feature requests. Bugs must be iso ## License -With v3.1, we're moving from the Apache 2 to the MIT license for the Bootstrap code (not the docs). We're in the process of collecting permissions from all Bootstrap contributors with code still part of the project to make this happen. For details, please see [#2054](https://github.com/twbs/bootstrap/issues/2054). - -By contributing your code, you agree to dual-license your contribution under the [Apache 2](https://github.com/twbs/bootstrap/blob/master/LICENSE) and [MIT](https://github.com/twbs/bootstrap/blob/master/LICENSE-MIT) licenses. +Prior to v3.1.0, Bootstrap was released under the Apache License v2.0. As of v3.1.0, Bootstrap is now licensed under the [MIT license](https://github.com/twbs/bootstrap/blob/master/LICENSE). By contributing your code, you agree to license your contribution under the [MIT license](https://github.com/twbs/bootstrap/blob/master/LICENSE). |