comparison LICENSE.md @ 5018:991308f49979 stable

doc: remove extra scheme from Mergely URL
author Kevin Bullock <kbullock@ringworld.org>
date Thu, 16 Apr 2015 14:14:59 -0400
parents 21fdc69bd446
children 1949ece749ce
comparison
equal deleted inserted replaced
5013:49e0b5a72ba2 5018:991308f49979
90 90
91 Mergely 91 Mergely
92 ------- 92 -------
93 93
94 Kallithea incorporates some code from the Javascript system called 94 Kallithea incorporates some code from the Javascript system called
95 [Mergely](http://http://www.mergely.com/), version 3.3.9. 95 [Mergely](http://www.mergely.com/), version 3.3.9.
96 [Mergely's license](http://www.mergely.com/license.php), a 96 [Mergely's license](http://www.mergely.com/license.php), a
97 [copy of which is included in this repository](LICENSE-MERGELY.html), 97 [copy of which is included in this repository](LICENSE-MERGELY.html),
98 is (GPL|LGPL|MPL). Kallithea as GPLv3'd project chooses the GPL arm of that 98 is (GPL|LGPL|MPL). Kallithea as GPLv3'd project chooses the GPL arm of that
99 tri-license. 99 tri-license.
100 100