]> git.parisson.com Git - django-social-auth.git/commitdiff
projects / django-social-auth.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d0c9462 5d610a5)
Merge remote branch 'upstream/master'
authorStas Kravets <skravets@applebough.(none)>
Fri, 25 Mar 2011 10:00:49 +0000 (13:00 +0300)
committerStas Kravets <skravets@applebough.(none)>
Fri, 25 Mar 2011 10:00:49 +0000 (13:00 +0300)
Conflicts:
setup.py

1  2 
social_auth/backends/__init__.py patch | diff1 | diff2 | blob | history

diff --cc social_auth/backends/__init__.py
Simple merge
Unnamed repository; edit this file 'description' to name the repository.