]> git.parisson.com Git - django-social-auth.git/commit
Merge remote-tracking branch 'upstream/master'
authorStas Kravets <krvss@mail.ru>
Wed, 2 May 2012 09:35:25 +0000 (13:35 +0400)
committerStas Kravets <krvss@mail.ru>
Wed, 2 May 2012 09:35:25 +0000 (13:35 +0400)
commit29e1436d16d609cbe6f440aa75363e9d25d7bfbf
treedfb8c65d53faf7130bec7948edc3dd06eb953d35
parentd3e225f4aa255682445efa2f5b508e9464fafd69
parenta5f018d4b5bf9348b87cbc374bf1b355073ff46b
Merge remote-tracking branch 'upstream/master'

Conflicts:
README.rst
example/local_settings.py.template
example/templates/done.html
social_auth/backends/contrib/vkontakte.py
social_auth/backends/contrib/yandex.py
social_auth/backends/facebook.py
social_auth/views.py
13 files changed:
README.rst
doc/configuration.rst
example/local_settings.py.template
example/settings.py
example/templates/done.html
social_auth/backends/__init__.py
social_auth/backends/contrib/mailru.py
social_auth/backends/contrib/odnoklassniki.py
social_auth/backends/contrib/vkontakte.py
social_auth/backends/contrib/yandex.py
social_auth/backends/facebook.py
social_auth/backends/google.py
social_auth/views.py