X-Git-Url: https://git.mdrn.pl/django-cas-provider.git/blobdiff_plain/4a51c1aaa9c3eeac5368ff4e06870a94f18123aa..605ad870b8d8b0154b3f27e730d1b3fff02c789b:/cas_provider/urls.py diff --git a/cas_provider/urls.py b/cas_provider/urls.py index 75399c0..f91786b 100644 --- a/cas_provider/urls.py +++ b/cas_provider/urls.py @@ -7,5 +7,5 @@ urlpatterns = patterns('', url(r'^socialauth-login/$', socialauth_login), url(r'^validate/', validate), url(r'^logout/', logout), - url(r'^merge/', login, {'merge': True}) + url(r'^login/merge/', login, {'merge': True, 'template_name': 'cas/merge.html'}) )