diff options
author | Jessica Tallon <jessica@megworld.co.uk> | 2014-07-23 00:23:23 +0100 |
---|---|---|
committer | Jessica Tallon <jessica@megworld.co.uk> | 2014-07-23 00:23:23 +0100 |
commit | aab62394773c27e73996e8cb8fb425db3fa62d49 (patch) | |
tree | 5f7e8a14f557f9917179fc8f2d4e9987ef98097a /mediagoblin/routing.py | |
parent | 59ff4790c9f33fe13ee0a411d4152bd256eaa06a (diff) | |
parent | a14d90c2db5ff96bdd72009a07f1afc0e8ef3595 (diff) | |
download | mediagoblin-aab62394773c27e73996e8cb8fb425db3fa62d49.tar.lz mediagoblin-aab62394773c27e73996e8cb8fb425db3fa62d49.tar.xz mediagoblin-aab62394773c27e73996e8cb8fb425db3fa62d49.zip |
Merge branch 'Federation'
Diffstat (limited to 'mediagoblin/routing.py')
-rw-r--r-- | mediagoblin/routing.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/mediagoblin/routing.py b/mediagoblin/routing.py index 9f2584d3..3ec1dba0 100644 --- a/mediagoblin/routing.py +++ b/mediagoblin/routing.py @@ -35,12 +35,11 @@ def get_url_map(): import mediagoblin.submit.routing import mediagoblin.user_pages.routing import mediagoblin.edit.routing - import mediagoblin.webfinger.routing import mediagoblin.listings.routing import mediagoblin.notifications.routing import mediagoblin.oauth.routing + import mediagoblin.federation.routing - for route in PluginManager().get_routes(): add_route(*route) |