]> git.parisson.com Git - django-social-auth.git/commit
Merge remote-tracking branch 'upstream/master'
authorStas Kravets <krvss@mail.ru>
Mon, 29 Aug 2011 08:43:12 +0000 (12:43 +0400)
committerStas Kravets <krvss@mail.ru>
Mon, 29 Aug 2011 08:43:12 +0000 (12:43 +0400)
commit2b521325f0dadbfa61bf38bfbd515b2ec839310b
treee385e27850dc8747181d69aba43f27aacaf0f327
parent2def980eb298df4c302d74a236aeab1be084c593
parent85f2b680299d44e51be532ce7864c9a24c064b40
Merge remote-tracking branch 'upstream/master'

Conflicts:
example/local_settings.py.template
example/local_settings.py.template
social_auth/backends/__init__.py
social_auth/backends/facebook.py