aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/listings/routing.py
diff options
context:
space:
mode:
authorChristopher Allan Webber <cwebber@dustycloud.org>2013-03-01 16:29:22 -0600
committerChristopher Allan Webber <cwebber@dustycloud.org>2013-03-01 16:29:22 -0600
commited6344009abb31326acabe95449aaa449f66f4b4 (patch)
tree03d65052d550b890074dde3c18857371be974f5c /mediagoblin/listings/routing.py
parent5c754fdaeeddb1bbeff165bbecb77e33b75b3c7d (diff)
parentb7a3798e1806eb52a244088fb600376ff25e0de9 (diff)
downloadmediagoblin-ed6344009abb31326acabe95449aaa449f66f4b4.tar.lz
mediagoblin-ed6344009abb31326acabe95449aaa449f66f4b4.tar.xz
mediagoblin-ed6344009abb31326acabe95449aaa449f66f4b4.zip
Merge branch 'master' into joar-skip_transcoding
Conflicts: mediagoblin/config_spec.ini
Diffstat (limited to 'mediagoblin/listings/routing.py')
-rw-r--r--mediagoblin/listings/routing.py8
1 files changed, 7 insertions, 1 deletions
diff --git a/mediagoblin/listings/routing.py b/mediagoblin/listings/routing.py
index e5683168..ee8f5020 100644
--- a/mediagoblin/listings/routing.py
+++ b/mediagoblin/listings/routing.py
@@ -19,5 +19,11 @@ from mediagoblin.tools.routing import add_route
add_route('mediagoblin.listings.tags_listing',
"/tag/<string:tag>/",
"mediagoblin.listings.views:tag_listing")
+
+# Atom feeds:
add_route('mediagoblin.listings.tag_atom_feed', "/tag/<string:tag>/atom/",
- "mediagoblin.listings.views:tag_atom_feed")
+ "mediagoblin.listings.views:atom_feed")
+
+# The all new entries feed
+add_route('mediagoblin.listings.atom_feed', '/atom/',
+ "mediagoblin.listings.views:atom_feed")