diff options
| author | Christopher Allan Webber <cwebber@dustycloud.org> | 2011-06-03 18:43:20 -0500 |
|---|---|---|
| committer | Christopher Allan Webber <cwebber@dustycloud.org> | 2011-06-03 18:43:20 -0500 |
| commit | 3f0679cd78363801f7b2b99a3278f416d45f5624 (patch) | |
| tree | 0ef2296cf6fc1295d8cb8466a1c359199e74440a /mediagoblin/routing.py | |
| parent | 55c74e1e4b36d56c1f3c8e69a4cbea43843093c8 (diff) | |
| parent | d5e90fe4b487e86261331fab0f7c08f12462625d (diff) | |
| download | mediagoblin-3f0679cd78363801f7b2b99a3278f416d45f5624.tar.lz mediagoblin-3f0679cd78363801f7b2b99a3278f416d45f5624.tar.xz mediagoblin-3f0679cd78363801f7b2b99a3278f416d45f5624.zip | |
Merge branch 'media_edit'
Diffstat (limited to 'mediagoblin/routing.py')
| -rw-r--r-- | mediagoblin/routing.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mediagoblin/routing.py b/mediagoblin/routing.py index 356ef678..b854c85a 100644 --- a/mediagoblin/routing.py +++ b/mediagoblin/routing.py @@ -19,6 +19,7 @@ from routes import Mapper from mediagoblin.auth.routing import auth_routes from mediagoblin.submit.routing import submit_routes from mediagoblin.user_pages.routing import user_routes +from mediagoblin.edit.routing import edit_routes def get_mapper(): mapping = Mapper() @@ -31,5 +32,6 @@ def get_mapper(): mapping.extend(auth_routes, '/auth') mapping.extend(submit_routes, '/submit') mapping.extend(user_routes, '/u') + mapping.extend(edit_routes, '/edit') return mapping |