fnp
/
django-cas-provider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Clarified validation logging.
[django-cas-provider.git]
/
cas_provider
/
urls.py
diff --git
a/cas_provider/urls.py
b/cas_provider/urls.py
index
051ad1c
..
f91786b
100644
(file)
--- 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'^socialauth-login/$', socialauth_login),
url(r'^validate/', validate),
url(r'^logout/', logout),
- url(r'^
merge/', login, {'merge': True, 'templat
e': 'cas/merge.html'})
+ url(r'^
login/merge/', login, {'merge': True, 'template_nam
e': 'cas/merge.html'})
)
)