]> git.parisson.com Git - django-social-auth.git/commit
Merge remote branch 'upstream/master'
authorStas Kravets <skravets@applebough.(none)>
Fri, 20 May 2011 07:51:33 +0000 (11:51 +0400)
committerStas Kravets <skravets@applebough.(none)>
Fri, 20 May 2011 07:51:33 +0000 (11:51 +0400)
commit10e6297ac997d4ce52a737b7fe0aae01b567a122
tree8b0e930a850f99442c944515b040a0fbee89fd94
parent5b96a5f83177f508c78f40869c49a1fa6b23178d
parent9fcc40bf8dbf971419d62bc6ac22f5e0c65b96cb
Merge remote branch 'upstream/master'

Conflicts:
example/templates/home.html
example/templates/done.html
example/templates/home.html
social_auth/backends/contrib/vkontakte.py