diff options
| author | Christopher Allan Webber <cwebber@dustycloud.org> | 2013-06-22 16:13:41 -0500 |
|---|---|---|
| committer | Christopher Allan Webber <cwebber@dustycloud.org> | 2013-06-22 16:13:41 -0500 |
| commit | 257b8ab62a6a5e04d60575a9766e5ed3503a15ed (patch) | |
| tree | 5d998fd1b955cb180ad1010c07ec35b1fd945b1b /mediagoblin/routing.py | |
| parent | 75ee3de301e7bea30c40fe26d857bb6cc7878f82 (diff) | |
| parent | 0c7fa7556ced34444db82d2d2d3b51b4f5327586 (diff) | |
| download | mediagoblin-257b8ab62a6a5e04d60575a9766e5ed3503a15ed.tar.lz mediagoblin-257b8ab62a6a5e04d60575a9766e5ed3503a15ed.tar.xz mediagoblin-257b8ab62a6a5e04d60575a9766e5ed3503a15ed.zip | |
Merge remote-tracking branch 'refs/remotes/joar/notifications'
Conflicts:
mediagoblin/db/migrations.py
Diffstat (limited to 'mediagoblin/routing.py')
| -rw-r--r-- | mediagoblin/routing.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mediagoblin/routing.py b/mediagoblin/routing.py index a650f22f..986eb2ed 100644 --- a/mediagoblin/routing.py +++ b/mediagoblin/routing.py @@ -35,6 +35,7 @@ def get_url_map(): import mediagoblin.edit.routing import mediagoblin.webfinger.routing import mediagoblin.listings.routing + import mediagoblin.notifications.routing for route in PluginManager().get_routes(): add_route(*route) |