fnp / django-cas-provider.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 18abc4f ef87a0c)
Merge remote-tracking branch 'gstrat/elep' into elep
authorRadek Czajka <rczajka@rczajka.pl>
Sat, 20 Sep 2014 20:49:12 +0000 (22:49 +0200)
committerRadek Czajka <rczajka@rczajka.pl>
Sat, 20 Sep 2014 20:49:12 +0000 (22:49 +0200)
Conflicts:
cas_provider_examples/simple/urls.py

1  2 
cas_provider/views.py patch | diff1 | diff2 | blob | history

diff --cc cas_provider/views.py
Simple merge
Unnamed repository; edit this file 'description' to name the repository.