diff options
| author | Mark Otto <[email protected]> | 2013-12-18 14:54:24 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-12-18 14:54:24 -0800 |
| commit | cb40a2ee8c88efdec0c35adf173cc96ba25db21e (patch) | |
| tree | f14fca4aeaaa470176142609c4368947e96243db /CONTRIBUTING.md | |
| parent | f29132350cb7f433d70589cc241d4bd14b6e551b (diff) | |
| download | bootstrap-cb40a2ee8c88efdec0c35adf173cc96ba25db21e.tar.xz bootstrap-cb40a2ee8c88efdec0c35adf173cc96ba25db21e.zip | |
Punt Apache license information and stick with MIT
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..2d4c8c364 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, Bootstrap was released under Apache 2. As of v3.1, we are now licensed under [MIT](https://github.com/twbs/bootstrap/blob/master/LICENSE). By contributing your code, you agree to license your contribution under the [MIT](https://github.com/twbs/bootstrap/blob/master/LICENSE-MIT) licenses. |