fnp / django-pagination.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from: 99f84ff)
Merge branch 'master' of git://github.com/cicuz/django-pagination
authorZygmunt Krynicki <zygmunt.krynicki@linaro.org>
Mon, 13 Jun 2011 12:30:21 +0000 (14:30 +0200)
committerZygmunt Bazyli Krynicki <Zygmunt Krynicki zygmunt.krynicki@linaro.org>
Mon, 13 Jun 2011 12:30:21 +0000 (14:30 +0200)
Conflicts:
linaro_django_pagination/templates/pagination/pagination.html
linaro_django_pagination/templatetags/pagination_tags.py


No differences found