X-Git-Url: https://git.mdrn.pl/django-cas-provider.git/blobdiff_plain/cc61c5969227c2d49544997ebbf074541029400b..08d3502c8f9a169713122c681d86eb16d9f8c1e6:/cas_provider/urls.py?ds=sidebyside

diff --git a/cas_provider/urls.py b/cas_provider/urls.py
index 8edc91a..f91786b 100644
--- 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'^login/merge/', login, {'merge': True, 'template_name': 'cas/merge.html'})
+                       )