]> git.parisson.com Git - django-social-auth.git/commit
Merge remote-tracking branch 'upstream/master'
authorStas Kravets <krvss@mail.ru>
Sat, 1 Oct 2011 15:24:56 +0000 (19:24 +0400)
committerStas Kravets <krvss@mail.ru>
Sat, 1 Oct 2011 15:24:56 +0000 (19:24 +0400)
commit6feae4562f26dc9c412d7d3fef7d73db9244be55
tree408cddc3ec37c0d56b74e00d14b14e67319e258c
parentd1514c6b4feb27808acafa0162b68a8764f24c9e
parent9db24fc37aa3c50423eb62e616899a0d4ae1f31f
Merge remote-tracking branch 'upstream/master'

Conflicts:
social_auth/backends/facebook.py
social_auth/backends/__init__.py
social_auth/backends/facebook.py