]> git.parisson.com Git - django-social-auth.git/commit
Merge remote-tracking branch 'upstream/master'
authorStas Kravets <krvss@mail.ru>
Mon, 17 Oct 2011 13:48:11 +0000 (17:48 +0400)
committerStas Kravets <krvss@mail.ru>
Mon, 17 Oct 2011 13:48:11 +0000 (17:48 +0400)
commit2c6fbec9d5740b428e782dd18e6ac37861ac5fc8
treee48841d04d8ed42f67327c632baf9a084a75f5e2
parent15aba051ae4fd4d6c514e4d0ed42a1d714b8fca4
parenta9cfde5b36a3f607f992c127d29d5b7ffd2e6039
Merge remote-tracking branch 'upstream/master'

Conflicts:
social_auth/backends/__init__.py
example/settings.py
social_auth/backends/__init__.py
social_auth/backends/contrib/yandex.py