summaryrefslogtreecommitdiff
path: root/coip/urls.py
diff options
context:
space:
mode:
authorLeif Johansson <leifj@sunet.se>2011-08-16 09:59:58 +0200
committerLeif Johansson <leifj@sunet.se>2011-08-16 09:59:58 +0200
commit1ad5e8f6b33f42966918d56f04c58e6b1e15357b (patch)
treeae1214a05802ea00812eaf30e0206d4035b09558 /coip/urls.py
parent36dad4f8b67948daef92257cea362c5d772279e3 (diff)
new profiles implementation
Diffstat (limited to 'coip/urls.py')
-rw-r--r--coip/urls.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/coip/urls.py b/coip/urls.py
index 4b1bc6f..13c422f 100644
--- a/coip/urls.py
+++ b/coip/urls.py
@@ -24,8 +24,8 @@ urlpatterns = patterns('',
(r'^accounts/login-federated/$', 'coip.apps.auth.views.accounts_login_federated'),
(r'^accounts/logout/$', 'coip.apps.auth.views.logout'),
# Profiles and user information
- (r'^user/merge/(?P<pkey>.+)$', 'coip.apps.userprofile.views.merge'),
- (r'^user/merge$', 'coip.apps.userprofile.views.merge'),
+ #(r'^user/merge/(?P<pkey>.+)$', 'coip.apps.userprofile.views.merge'),
+ #(r'^user/merge$', 'coip.apps.userprofile.views.merge'),
(r'^user/home$', 'coip.apps.userprofile.views.home'),
(r'^user/(.+)/groups.json$', 'coip.apps.name.views.user_groups'),
(r'^user/search.json$', 'coip.apps.userprofile.views.search'),