]> git.parisson.com Git - django-social-auth.git/commitdiff
projects / django-social-auth.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 69f1ccb 567fb30)
Merge branch 'master' of https://github.com/ryr/django-social-auth
authorryr <ryr1986@gmail.com>
Thu, 18 Aug 2011 11:28:43 +0000 (18:28 +0700)
committerryr <ryr1986@gmail.com>
Thu, 18 Aug 2011 11:28:43 +0000 (18:28 +0700)
Conflicts:
social_auth/backends/contrib/vkontakte.py


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.