From: Stas Kravets Date: Wed, 9 May 2012 10:18:35 +0000 (+0400) Subject: Merge remote-tracking branch 'upstream/master' X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=bb864506d87e69aaed35ce00175ec20c700f05dc;p=django-social-auth.git 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 --- bb864506d87e69aaed35ce00175ec20c700f05dc diff --cc example/settings.py index bbf2113,29f3ae6..46ae9e7 --- a/example/settings.py +++ b/example/settings.py @@@ -79,7 -79,10 +79,8 @@@ AUTHENTICATION_BACKENDS = 'social_auth.backends.contrib.flickr.FlickrBackend', 'social_auth.backends.contrib.instagram.InstagramBackend', 'social_auth.backends.contrib.github.GithubBackend', - 'social_auth.backends.contrib.vkontakte.VkontakteBackend', 'social_auth.backends.contrib.yandex.YandexBackend', - 'social_auth.backends.contrib.yandex.YaruBackend', + 'social_auth.backends.contrib.yahoo.YahooOAuthBackend', 'social_auth.backends.OpenIDBackend', 'social_auth.backends.contrib.livejournal.LiveJournalBackend', 'social_auth.backends.browserid.BrowserIDBackend',