diff options
| author | Chris Rebert <[email protected]> | 2015-01-15 15:01:40 -0800 |
|---|---|---|
| committer | Chris Rebert <[email protected]> | 2015-01-15 15:01:40 -0800 |
| commit | 86d368eb6d1e35edb2485be50efabc1bfc3e5bcd (patch) | |
| tree | a4cc70553c3be19242b45b08f9fbc48653f76a16 | |
| parent | 6ccf46a56b0d06e415b8087622a240399e2932e2 (diff) | |
| parent | 16089d92de03ba212882ad5082fc0d5e4da38ad6 (diff) | |
| download | bootstrap-86d368eb6d1e35edb2485be50efabc1bfc3e5bcd.tar.xz bootstrap-86d368eb6d1e35edb2485be50efabc1bfc3e5bcd.zip | |
Merge pull request #15578 from twbs/licensing-contributing
Clarify in CONTRIBUTING docs that CC-BY 3.0 License applies to Bootstrap's docs
| -rw-r--r-- | CONTRIBUTING.md | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 8950dc487..7b14660c6 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -197,7 +197,10 @@ included in the project: with a clear title and description against the `master` branch. **IMPORTANT**: By submitting a patch, you agree to allow the project owners to -license your work under the terms of the [MIT License](LICENSE). +license your work under the terms of the [MIT License](LICENSE) (if it +includes code changes) and under the terms of the +[Creative Commons Attribution 3.0 Unported License](docs/LICENSE) +(if it includes documentation changes). ### Pull request bots @@ -240,6 +243,7 @@ Run `grunt test` before committing to ensure your changes follow our coding stan ## License -By contributing your code, you agree to license your contribution under the [MIT license](LICENSE). +By contributing your code, you agree to license your contribution under the [MIT License](LICENSE). +By contributing to the documentation, you agree to license your contribution under the [Creative Commons Attribution 3.0 Unported License](docs/LICENSE). -Prior to v3.1.0, Bootstrap was released under the Apache License v2.0. +Prior to v3.1.0, Bootstrap's code was released under the Apache License v2.0. |