Merge remote branch 'remotes/aaronw/feature410_markdown_bio'

[mediagoblin.git] / mediagoblin / routing.py

diff --git a/mediagoblin/routing.py b/mediagoblin/routing.py
index b47bec8d4fe45c42080bd408783927f6f1b8a4d6..b854c85a5d3dcdf40393c095922011a257902f4d 100644 (file)
--- a/mediagoblin/routing.py
+++ b/mediagoblin/routing.py
@@ -18,7 +18,8 @@ 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()
@@ -30,5 +31,7 @@ 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