Changeset - 7e5a0c784880
[Not reviewed]
Merge default
0 2 0
Mads Kiilerich - 11 years ago 2015-04-20 22:52:23
madski@unity3d.com
Merge stable
2 files changed with 2 insertions and 2 deletions:
0 comments (0 inline, 0 general)
LICENSE.md
Show inline comments
 
@@ -92,7 +92,7 @@ Mergely
 
-------
 

	
 
Kallithea incorporates some code from the Javascript system called
 
[Mergely](http://http://www.mergely.com/), version 3.3.9.
 
[Mergely](http://www.mergely.com/), version 3.3.9.
 
[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
kallithea/templates/pullrequests/pullrequest_data.html
Show inline comments
 
@@ -82,7 +82,7 @@
 
  </table>
 
</div>
 

	
 
%if pager in pullrequests:
 
%if pullrequests.pager:
 
<div class="notification-paginator">
 
  <div class="pagination-wh pagination-left">
 
  ${pullrequests.pager('$link_previous ~2~ $link_next', **request.GET.mixed())}
0 comments (0 inline, 0 general)