diff options
| author | Jef van Schendel <jefvanschendel@gmail.com> | 2011-06-04 02:22:09 +0200 |
|---|---|---|
| committer | Jef van Schendel <jefvanschendel@gmail.com> | 2011-06-04 02:22:09 +0200 |
| commit | f4b2bd93f2f9c0f5fbef5214b2fe97912857b175 (patch) | |
| tree | 1a83f2b7a82d10a1a8f795f5f9876cf5ba5ad269 /mediagoblin/routing.py | |
| parent | 2165d464a4aed262deeb7b8b0a3fc283c7adc326 (diff) | |
| parent | c042bc6e218e99f93c1e642b1d77839ca0f4b1f9 (diff) | |
| download | mediagoblin-f4b2bd93f2f9c0f5fbef5214b2fe97912857b175.tar.lz mediagoblin-f4b2bd93f2f9c0f5fbef5214b2fe97912857b175.tar.xz mediagoblin-f4b2bd93f2f9c0f5fbef5214b2fe97912857b175.zip | |
Merge remote-tracking branch 'gitorious/master'
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 |