Merge remote branch 'remotes/aaronw/feature410_markdown_bio'

[mediagoblin.git] / mediagoblin / routing.py

diff --git a/mediagoblin/routing.py b/mediagoblin/routing.py
index 356ef678853f2ded12374793dfcfadb131669465..b854c85a5d3dcdf40393c095922011a257902f4d 100644 (file)
--- 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