]> git.parisson.com Git - django-social-auth.git/commit
Merge remote branch 'upstream/master'
authorStas Kravets <skravets@applebough.(none)>
Mon, 4 Jul 2011 07:59:23 +0000 (11:59 +0400)
committerStas Kravets <skravets@applebough.(none)>
Mon, 4 Jul 2011 07:59:23 +0000 (11:59 +0400)
commita7dbeae14c3f345bbcaad024f80571e499b66461
tree70ec138d91b78228a14a28b4d6c4035306808c3b
parentea39a1788f6da3ae54ab689dae1f39c31492c224
parent65ef1bb243b559b1a6f05a882aec3fa89be25ed6
Merge remote branch 'upstream/master'

Conflicts:
example/templates/done.html
example/templates/home.html
example/app/views.py
example/settings.py
example/templates/done.html
example/templates/home.html
social_auth/backends/__init__.py
social_auth/backends/facebook.py