diff options
| author | Mark Otto <[email protected]> | 2013-12-18 15:26:17 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-12-18 15:26:17 -0800 |
| commit | 766bf50b88fe3938837cb11d849f6646a77351fe (patch) | |
| tree | d72f1e5d5c213111af2d954bb7a0179cbf400a28 | |
| parent | ccc894361f2c1fd8f403723e30aca6ff4beafa1f (diff) | |
| parent | 5428523a3762ae274dffe3d2e7a4a434e6ff70f3 (diff) | |
| download | bootstrap-766bf50b88fe3938837cb11d849f6646a77351fe.tar.xz bootstrap-766bf50b88fe3938837cb11d849f6646a77351fe.zip | |
Merge branch 'master' of github.com:twbs/bootstrap
| -rw-r--r-- | CONTRIBUTING.md | 2 |
1 files changed, 1 insertions, 1 deletions
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). |