diff options
| author | Mark Otto <[email protected]> | 2013-10-15 13:12:46 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-10-15 13:12:46 -0700 |
| commit | 723f85fc0d83a8cdf2f3bdfd09cd903aaf124bef (patch) | |
| tree | 137571c90b1ec7f44b0996617d0d8bc99e950396 /CONTRIBUTING.md | |
| parent | 2380b6be9937dfc0ca924a2334adfb21ddb91cc0 (diff) | |
| parent | dd5c8a53eec70ea84bc89235e2a4cd0439034219 (diff) | |
| download | bootstrap-723f85fc0d83a8cdf2f3bdfd09cd903aaf124bef.tar.xz bootstrap-723f85fc0d83a8cdf2f3bdfd09cd903aaf124bef.zip | |
Merge pull request #11105 from twbs/license-note
Add notes about dual-licensing contributions before switching to MIT in v3.1
Diffstat (limited to 'CONTRIBUTING.md')
| -rw-r--r-- | CONTRIBUTING.md | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index fcd95bf7a..6ef0494ed 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -55,4 +55,6 @@ We only accept issues that are bug reports or feature requests. Bugs must be iso ## License -By contributing your code, you agree to license your contribution under the terms of the APLv2: https://github.com/twbs/bootstrap/blob/master/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/MIT) licenses. |