X-Git-Url: https://git.mdrn.pl/django-cas-provider.git/blobdiff_plain/f561c14ccdbedaac9e217d249aa6620ab3b06c02..08d3502c8f9a169713122c681d86eb16d9f8c1e6:/cas_provider/urls.py?ds=sidebyside diff --git a/cas_provider/urls.py b/cas_provider/urls.py index 051ad1c..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, 'template': 'cas/merge.html'}) + url(r'^login/merge/', login, {'merge': True, 'template_name': 'cas/merge.html'}) )