diff options
| author | Leif Johansson <leifj@sunet.se> | 2011-08-18 10:41:41 +0200 |
|---|---|---|
| committer | Leif Johansson <leifj@sunet.se> | 2011-08-18 10:41:41 +0200 |
| commit | 8b62502983ca646104f22ecb56cf97ff8922756a (patch) | |
| tree | 6dea14dea1b13a8fdb919d9ada7f10a816876131 /coip/urls.py | |
| parent | 9d4561febd0489eb8cab1fc3654614b1a5ed17ac (diff) | |
new profile-model
Diffstat (limited to 'coip/urls.py')
| -rw-r--r-- | coip/urls.py | 4 |
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'), |