]> git.parisson.com Git - django-social-auth.git/commit
Merge remote-tracking branch 'origin/master'
authorStas Kravets <krvss@mail.ru>
Fri, 9 Mar 2012 11:55:29 +0000 (15:55 +0400)
committerStas Kravets <krvss@mail.ru>
Fri, 9 Mar 2012 11:55:29 +0000 (15:55 +0400)
commit3e95b2abf0114f34f26ffc3f124f88e60ef89deb
tree0c21dc82824ab0070e51525bb0132de046eeab79
parentc4b7e717d1840f0345d37c4ed8969b737ebf57b4
parent46c9a576f4c4cc2cec40ea10e743d7215ac673b9
Merge remote-tracking branch 'origin/master'

Conflicts:
social_auth/backends/__init__.py
social_auth/backends/exceptions.py
social_auth/backends/facebook.py
social_auth/backends/pipeline/social.py
social_auth/views.py
setup.py
social_auth/backends/exceptions.py
social_auth/backends/pipeline/social.py
social_auth/views.py