kallithea Changeset - f8bb2cf6bdaf

Changeset - f8bb2cf6bdaf

Parent rev.

Child rev.

[Not reviewed]

rhodecode-2.2.5-gpl

0 1 0

Bradley M. Kuhn - 12 years ago 2014-05-16 22:40:05
bkuhn@sfconservancy.org

Update LICENSE.md to include license information about Mousetrap.

1 file changed with 16 insertions and 0 deletions:

LICENSE.md

0 comments (0 inline, 0 general)

LICENSE.md

➞

Show inline comments

@@ @@ -46,24 +46,40 @@ jQuery @@
 Kallithea incorporates the Javascript system called
 [jQuery](http://jquery.org/),
 [herein](rhodecode/public/js/jquery-1.10.2.min.js), and the Corresponding
 Source can be found in https://github.com/jquery/jquery at tag 1.10.2
 (mirrored at https://kallithea-scm.org/repos/mirror/jquery/files/1.10.2/ ).
 It is Copyright 2013 jQuery Foundation and other contributors http://jquery.com/ and is under an
 [MIT-permissive license](MIT-Permissive-License.txt).
 Mousetrap
 ---------
 Kallithea incorporates parts of the Javascript system called
 [Mousetrap](http://craig.is/killing/mice/), which is:
    Copyright 2013 Craig Campbell
 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](Apache-License-2.0.txt) is also included
 in this distribution.
 Mergely
 -------
 Kallithea incorporates some code from the Javascript system called
 [Mergely](http://http://www.mergely.com/).
 [Mergely's license](http://www.mergely.com/license.php), a
 [copy of which is included in this repository](LICENSE-MERGELY.html),
 is (GPL|LGPL|MPL).  Kallithea as GPLv3'd project chooses the GPL arm of that
 tri-license.

0 comments (0 inline, 0 general)