Added more specific exception handling. This clears up the LoginTicket issue we were...

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

diff --git a/cas_provider/urls.py b/cas_provider/urls.py
index 8edc91a..051ad1c 100644 (file)
--- a/cas_provider/urls.py
+++ b/cas_provider/urls.py
@@ -3,7 +3,9 @@ from django.conf.urls.defaults import *
 from views import *
 
 urlpatterns = patterns('',
-    url(r'^login/', login),
-    url(r'^validate/', validate),
-    url(r'^logout/', logout),
-)
\ No newline at end of file
+                       url(r'^login/', login),
+                       url(r'^socialauth-login/$', socialauth_login),
+                       url(r'^validate/', validate),
+                       url(r'^logout/', logout),
+                       url(r'^merge/', login, {'merge': True, 'template': 'cas/merge.html'})
+                       )