fnp
/
django-cas-provider.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
02f5835
)
Added missing comma.
author
deyk
<deyk@crossway.org>
Mon, 16 Apr 2012 18:00:01 +0000
(11:00 -0700)
committer
deyk
<deyk@crossway.org>
Mon, 16 Apr 2012 18:00:01 +0000
(11:00 -0700)
cas_provider/urls.py
patch
|
blob
|
history
diff --git
a/cas_provider/urls.py
b/cas_provider/urls.py
index
154aac0
..
22f3dc7
100644
(file)
--- a/
cas_provider/urls.py
+++ b/
cas_provider/urls.py
@@
-2,7
+2,7
@@
from django.conf.urls.defaults import patterns, url
urlpatterns = patterns('cas_provider.views',
- url(r'^login/merge/', 'login', {'merge': True, 'template_name': 'cas/merge.html'})
+ url(r'^login/merge/', 'login', {'merge': True, 'template_name': 'cas/merge.html'})
,
url(r'^login/?$', 'login', name='cas_login'),
url(r'^socialauth-login/$', 'socialauth_login', name='cas_socialauth_login'),
url(r'^validate/?$', 'validate', name='cas_validate'),