]> git.parisson.com Git - django-social-auth.git/commit
Merge remote-tracking branch 'upstream/master'; Fixing VKontakte bad exception declar...
authorStas Kravets <krvss@mail.ru>
Tue, 23 Aug 2011 09:46:19 +0000 (13:46 +0400)
committerStas Kravets <krvss@mail.ru>
Tue, 23 Aug 2011 09:46:19 +0000 (13:46 +0400)
commit623626850aad94b0670b4f070b7e3b1df5be2122
treef10bd784a87ca69ffe4089f027fa888c2f83c4bd
parent108292071ae10d06913025da052a1459f06b1879
parentb2ba38358b0c7a8a6bb3034a88bf77dc2e68d16c
Merge remote-tracking branch 'upstream/master'; Fixing VKontakte bad exception declaration

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