diff options
| author | Jef van Schendel <jefvanschendel@gmail.com> | 2011-06-06 14:46:56 +0200 |
|---|---|---|
| committer | Jef van Schendel <jefvanschendel@gmail.com> | 2011-06-06 14:46:56 +0200 |
| commit | ec8f66bd650e580eae67ad97fbc81776365d84f2 (patch) | |
| tree | 499c0c5ef2868c8f3de724133a9f468122c79589 /mediagoblin/user_pages/routing.py | |
| parent | f4b2bd93f2f9c0f5fbef5214b2fe97912857b175 (diff) | |
| parent | 3aa4c668b9bfe53ed58d4ae21ed91210df7ad9ff (diff) | |
| download | mediagoblin-ec8f66bd650e580eae67ad97fbc81776365d84f2.tar.lz mediagoblin-ec8f66bd650e580eae67ad97fbc81776365d84f2.tar.xz mediagoblin-ec8f66bd650e580eae67ad97fbc81776365d84f2.zip | |
Merge remote-tracking branch 'gitorious/master'
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 96f97427..c5e9a984 100644 --- a/mediagoblin/user_pages/routing.py +++ b/mediagoblin/user_pages/routing.py @@ -22,5 +22,7 @@ user_routes = [ 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"), + Route('mediagoblin.edit.edit_media', "/{user}/m/{media}/edit/", + controller="mediagoblin.edit.views:edit_media"), Route('mediagoblin.user_pages.atom_feed', '/{user}/atom/', controller="mediagoblin.user_pages.views:atom_feed")] |