]> git.parisson.com Git - django-social-auth.git/commit
Merge remote branch 'upstream/master', updating to support latest changes
authorStas Kravets <skravets@applebough.(none)>
Fri, 18 Feb 2011 16:55:55 +0000 (19:55 +0300)
committerStas Kravets <skravets@applebough.(none)>
Fri, 18 Feb 2011 16:55:55 +0000 (19:55 +0300)
commitcfdcab1233df17c6c91ceb3dbc0dae5d7f5bed70
tree28b6847ef36cd2c475876aa8b34f64c7aee9344b
parent0577db6d68c6d3ff1a02bac0653fec8fd14e1040
parenta04b4435dad8a48a23c3ab34682fb7d5ecd47a51
Merge remote branch 'upstream/master', updating to support latest changes

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