Mercurial > kallithea
changeset 5046:7e5a0c784880
Merge stable
| author | Mads Kiilerich <madski@unity3d.com> |
|---|---|
| date | Mon, 20 Apr 2015 22:52:23 +0200 |
| parents | 5a051d86fc63 (current diff) bd4f453a0055 (diff) |
| children | 99f090563f5f |
| files | |
| diffstat | 2 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/LICENSE.md Mon Apr 20 19:27:33 2015 +0200 +++ b/LICENSE.md Mon Apr 20 22:52:23 2015 +0200 @@ -92,7 +92,7 @@ ------- 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
--- a/kallithea/templates/pullrequests/pullrequest_data.html Mon Apr 20 19:27:33 2015 +0200 +++ b/kallithea/templates/pullrequests/pullrequest_data.html Mon Apr 20 22:52:23 2015 +0200 @@ -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())}