fnp / django-cas-provider.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from: 82555c5)
Merge remote-tracking branch 'cas2/master'
authordeyk <deyk@crossway.org>
Fri, 13 Apr 2012 22:25:48 +0000 (15:25 -0700)
committerdeyk <deyk@crossway.org>
Fri, 13 Apr 2012 22:26:25 +0000 (15:26 -0700)
Conflicts:
.gitignore
cas_provider/forms.py
cas_provider/models.py
cas_provider/urls.py
cas_provider/views.py

Merged from https://github.com/castlabs/django-cas-provider

PT #27996721


No differences found
Unnamed repository; edit this file 'description' to name the repository.