From 1ad5e8f6b33f42966918d56f04c58e6b1e15357b Mon Sep 17 00:00:00 2001 From: Leif Johansson Date: Tue, 16 Aug 2011 09:59:58 +0200 Subject: new profiles implementation --- coip/urls.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'coip/urls.py') 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.+)$', 'coip.apps.userprofile.views.merge'), - (r'^user/merge$', 'coip.apps.userprofile.views.merge'), + #(r'^user/merge/(?P.+)$', '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'), -- cgit v1.1