]> git.parisson.com Git - django-social-auth.git/commit
Merge remote-tracking branch 'upstream/master'
authorStas Kravets <krvss@mail.ru>
Wed, 9 May 2012 10:18:35 +0000 (14:18 +0400)
committerStas Kravets <krvss@mail.ru>
Wed, 9 May 2012 10:18:35 +0000 (14:18 +0400)
commitbb864506d87e69aaed35ce00175ec20c700f05dc
tree1b8ad0dc72d99386a8b0ce99736ecddad8aef48b
parenta8a1539d67a461beafaf49c0e68e61ecb168e59a
parentbdd23b595edda0fb3a22f2da583b10d1eadb7652
Merge remote-tracking branch 'upstream/master'

Conflicts:
example/settings.py
social_auth/backends/__init__.py
social_auth/backends/contrib/vkontakte.py
social_auth/backends/contrib/yandex.py
README.rst
example/settings.py
social_auth/backends/facebook.py