Koha-community/Koha
13
7
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'bug_9595' into 3.12-master

Browse source
This commit is contained in:
Jared Camins-Esakov 2013-03-27 22:05:14 -04:00
commit 8bae32a35e
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
koha-tmpl/intranet-tmpl/prog/en/modules/about.tt
View file

@ -394,7 +394,7 @@
<div id="licenses">
<h2>Koha</h2>
<p>
<a href="http://www.gnu.org/licenses/old-licenses/gpl-2.0.html">Koha is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.</a>
<a href="http://www.gnu.org/licenses/gpl-3.0.html">Koha is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version.</a>
</p>
<h2>jQuery and jQueryUI</h2>
<p><a href="http://jquery.com/">jQuery</a> and <a href="http://jqueryui.com/">jQueryUI</a> are licensed under the <a href="http://github.com/jquery/jquery/blob/master/MIT-LICENSE.txt">MIT license</a></p>
@ -402,7 +402,7 @@
<p><a href="http://twitter.github.com/bootstrap/">Bootstrap</a> code and <a href="http://glyphicons.com">Glyphicons Free</a> licensed under <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License v2.0</a>.</p>
<h2>YUI</h2>
<p>
<a href="http://developer.yahoo.com/auth/license.txt">BSD License</a>
<a href="http://yuilibrary.com/license/">BSD License</a>
</p>
<h2>Famfamfam iconset</h2>
<ul>