aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/views.py
diff options
context:
space:
mode:
authorChristopher Allan Webber <cwebber@dustycloud.org>2011-11-18 09:34:09 -0600
committerChristopher Allan Webber <cwebber@dustycloud.org>2011-11-18 09:34:09 -0600
commit817066506d846d06d0489dfb42b8200b86f61153 (patch)
tree36578ed7e5b2b205c919fcfb8929c8fc33a79c3f /mediagoblin/views.py
parent76c6c806caec7af20a3fe11c04bb783baacc3934 (diff)
parent3618a9ac5112c657fd095a0f9cbd346921a4e800 (diff)
downloadmediagoblin-817066506d846d06d0489dfb42b8200b86f61153.tar.lz
mediagoblin-817066506d846d06d0489dfb42b8200b86f61153.tar.xz
mediagoblin-817066506d846d06d0489dfb42b8200b86f61153.zip
Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin
Conflicts: mediagoblin/templates/mediagoblin/user_pages/user.html
Diffstat (limited to 'mediagoblin/views.py')
-rw-r--r--mediagoblin/views.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/mediagoblin/views.py b/mediagoblin/views.py
index 22f9268d..ecf5b723 100644
--- a/mediagoblin/views.py
+++ b/mediagoblin/views.py
@@ -20,6 +20,7 @@ from mediagoblin.tools.response import render_to_response
from mediagoblin.db.util import DESCENDING
from mediagoblin.decorators import uses_pagination
+
@uses_pagination
def root_view(request, page):
cursor = request.db.MediaEntry.find(