diff options
author | Christopher Allan Webber <cwebber@dustycloud.org> | 2011-06-18 11:10:46 -0500 |
---|---|---|
committer | Christopher Allan Webber <cwebber@dustycloud.org> | 2011-06-18 11:10:46 -0500 |
commit | c897283849abbe7f7e6506c2c3b179ff0fd3f9d2 (patch) | |
tree | d545dc3fe7a3a2c2c9cadab630d815c47776e54a /mediagoblin/user_pages/routing.py | |
parent | e2c6436e3e7c654a8d4196ac378debf185c74fa4 (diff) | |
parent | 5a994e37c2947d20e3aedfb78f9d6194dd59d506 (diff) | |
download | mediagoblin-c897283849abbe7f7e6506c2c3b179ff0fd3f9d2.tar.lz mediagoblin-c897283849abbe7f7e6506c2c3b179ff0fd3f9d2.tar.xz mediagoblin-c897283849abbe7f7e6506c2c3b179ff0fd3f9d2.zip |
Merge branch 'master' into configobj
Conflicts:
setup.py
Diffstat (limited to 'mediagoblin/user_pages/routing.py')
-rw-r--r-- | mediagoblin/user_pages/routing.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mediagoblin/user_pages/routing.py b/mediagoblin/user_pages/routing.py index c5e9a984..92998726 100644 --- a/mediagoblin/user_pages/routing.py +++ b/mediagoblin/user_pages/routing.py @@ -19,6 +19,8 @@ from routes.route import Route user_routes = [ Route('mediagoblin.user_pages.user_home', "/{user}/", controller="mediagoblin.user_pages.views:user_home"), + Route('mediagoblin.user_pages.user_gallery', "/{user}/gallery/", + controller="mediagoblin.user_pages.views:user_gallery"), Route('mediagoblin.user_pages.media_home', '/{user}/m/{media}/', requirements=dict(m_id="[0-9a-fA-F]{24}"), controller="mediagoblin.user_pages.views:media_home"), |