diff options
| author | tilly-Q <nattilypigeonfowl@gmail.com> | 2013-08-20 12:21:13 -0400 |
|---|---|---|
| committer | tilly-Q <nattilypigeonfowl@gmail.com> | 2013-08-20 12:21:13 -0400 |
| commit | 9e204e49c9670b0e004dc9b62bf3b698b7534325 (patch) | |
| tree | 452eab56add0e1b009b665f5b32d7b59b7545e82 /mediagoblin/routing.py | |
| parent | e1561d048815e29b3b7c7e1c860d9cf0c4326f0a (diff) | |
| parent | c62d174437445565b55b220396e7571a323a159c (diff) | |
| download | mediagoblin-9e204e49c9670b0e004dc9b62bf3b698b7534325.tar.lz mediagoblin-9e204e49c9670b0e004dc9b62bf3b698b7534325.tar.xz mediagoblin-9e204e49c9670b0e004dc9b62bf3b698b7534325.zip | |
Merge branch 'master' into OPW-Moderation-Update
Conflicts:
mediagoblin/db/models.py
mediagoblin/decorators.py
mediagoblin/routing.py
mediagoblin/user_pages/views.py
Diffstat (limited to 'mediagoblin/routing.py')
| -rw-r--r-- | mediagoblin/routing.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mediagoblin/routing.py b/mediagoblin/routing.py index 9686d103..a9809c44 100644 --- a/mediagoblin/routing.py +++ b/mediagoblin/routing.py @@ -38,8 +38,8 @@ def get_url_map(): import mediagoblin.webfinger.routing import mediagoblin.listings.routing import mediagoblin.notifications.routing - - + import mediagoblin.oauth.routing + for route in PluginManager().get_routes(): add_route(*route) |