From cb40a2ee8c88efdec0c35adf173cc96ba25db21e Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 18 Dec 2013 14:54:24 -0800 Subject: Punt Apache license information and stick with MIT --- CONTRIBUTING.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'CONTRIBUTING.md') 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. -- cgit v1.2.3 From 5428523a3762ae274dffe3d2e7a4a434e6ff70f3 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Wed, 18 Dec 2013 15:16:29 -0800 Subject: cleanup licensing section more --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'CONTRIBUTING.md') diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 2d4c8c364..c8b40a07b 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -59,7 +59,7 @@ We only accept issues that are bug reports or feature requests. Bugs must be iso ## License -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. +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). -- cgit v1.2.3