Mercurial > kallithea
diff LICENSE.md @ 6276:5ae3fff8994e
style: upgrade Bootstrap to v3.3.7
| author | domruf <dominikruf@gmail.com> |
|---|---|
| date | Wed, 21 Sep 2016 00:13:48 +0200 |
| parents | b4db7ff78343 |
| children | d36d4d953085 |
line wrap: on
line diff
--- a/LICENSE.md Tue Oct 11 17:45:40 2016 +0200 +++ b/LICENSE.md Wed Sep 21 00:13:48 2016 +0200 @@ -38,16 +38,17 @@ Bootstrap --------- -Kallithea incorporates parts of the Javascript system called +Kallithea incorporates the web framework called [Bootstrap](http://getbootstrap.com/), which is: -Copyright © 2012 Twitter, Inc. +Copyright © 2011-2016 Twitter, Inc. +Copyright © 2011-2016 The Bootstrap Authors -and licensed under -[the Apache License 2.0](http://www.apache.org/licenses/LICENSE-2.0.html). - -A copy of the Apache License 2.0 is also included in this distribution in its -entirety in the file Apache-License-2.0.txt +and licensed under the MIT-permissive license, which is +[included in this distribution](MIT-Permissive-License.txt), +which can be found together with its Corresponding Source in +https://github.com/twbs/bootstrap at tag v3.3.7 (mirrored at +https://kallithea-scm.org/repos/mirror/bootstrap/ ).