summaryrefslogtreecommitdiff
path: root/coip/urls.py
diff options
context:
space:
mode:
Diffstat (limited to 'coip/urls.py')
-rw-r--r--coip/urls.py8
1 files changed, 5 insertions, 3 deletions
diff --git a/coip/urls.py b/coip/urls.py
index 49df4d4..e41a47a 100644
--- a/coip/urls.py
+++ b/coip/urls.py
@@ -71,9 +71,11 @@ urlpatterns = patterns('',
(r'^rtree.json$', 'coip.apps.name.views.rtree'),
(r'^rtree/(?P<id>[0-9]+).json$', 'coip.apps.name.views.rtree'),
# APIs
+ (r'^api/activitystreams', include('coip.apps.activitystreams.urls')),
+ (r'^api/opensocial/1.0/rpc', 'coip.apps.opensocial.common.system'),
+ #(r'^opensocial/2.0/activitystreams', include(opensocial_v2_as.urls)),
+ (r'^api/opensocial/', include(opensocial_v1.urls)),
+ (r'^api/hello/?', 'coip.apps.name.views.hello'),
(r'^api/', include(v1_api.urls)),
- (r'^opensocial/1.0/rpc', 'coip.apps.opensocial.common.system'),
- (r'^opensocial/', include(opensocial_v1.urls)),
- (r'^hello/?', 'coip.apps.name.views.hello'),
(r'^oauth2/', include('django_oauth2_lite.urls'))
)