From: Zygmunt Krynicki <zygmunt.krynicki@linaro.org>
Date: Mon, 13 Jun 2011 12:45:15 +0000 (+0200)
Subject: Merge branch 'master' of git://github.com/tzangms/django-pagination
X-Git-Tag: release-2.0~28
X-Git-Url: https://git.mdrn.pl/django-pagination.git/commitdiff_plain/19af5cdf69b55c5bce39f2ca83e12372d395e49c?hp=1dd45d4cf95cf93d4d55fb5d15f81543ff5b4eed

Merge branch 'master' of git://github.com/tzangms/django-pagination
---

diff --git a/linaro_django_pagination/templatetags/pagination_tags.py b/linaro_django_pagination/templatetags/pagination_tags.py
index 1e7d5da..f4ddde7 100755
--- a/linaro_django_pagination/templatetags/pagination_tags.py
+++ b/linaro_django_pagination/templatetags/pagination_tags.py
@@ -251,6 +251,8 @@ def paginate(context, window=DEFAULT_WINDOW):
             differenced.sort()
             pages.extend(differenced)
         to_return = {
+            'MEDIA_URL': settings.MEDIA_URL,
+            'STATIC_URL': settings.STATIC_URL,
             'pages': pages,
             'page_obj': page_obj,
             'paginator': paginator,