Merge remote-tracking branch 'cas2/master'

[django-cas-provider.git] / cas_provider / urls.py

diff --git a/cas_provider/urls.py b/cas_provider/urls.py
index 37da0af..154aac0 100644 (file)
--- a/cas_provider/urls.py
+++ b/cas_provider/urls.py
@@ -2,7 +2,9 @@ from django.conf.urls.defaults import patterns, url
 
 
 urlpatterns = patterns('cas_provider.views',
+    url(r'^login/merge/', 'login', {'merge': True, 'template_name': 'cas/merge.html'})
     url(r'^login/?$', 'login', name='cas_login'),
+    url(r'^socialauth-login/$', 'socialauth_login', name='cas_socialauth_login'),
     url(r'^validate/?$', 'validate', name='cas_validate'),
     url(r'^proxy/?$', 'proxy', name='proxy'),
     url(r'^serviceValidate/?$', 'service_validate', name='cas_service_validate'),