]> git.parisson.com Git - django-social-auth.git/commit
Merge remote-tracking branch 'estebistec/alt-storage' into estebistec
authorMatías Aguirre <matiasaguirre@gmail.com>
Mon, 2 Jul 2012 22:36:42 +0000 (19:36 -0300)
committerMatías Aguirre <matiasaguirre@gmail.com>
Mon, 2 Jul 2012 22:36:42 +0000 (19:36 -0300)
commitbcbf203e68e19c7590475222c34ccd34e01acb6d
treef9d1456ddfae52833f35179741c6ec2058dbde3f
parente3eed05be9969719905a50d594de153ba0dfe077
parentb1ee72c7a17354198ba13237516a260709b5736a
Merge remote-tracking branch 'estebistec/alt-storage' into estebistec

Conflicts:
social_auth/models.py
social_auth/backends/pipeline/social.py
social_auth/django_models.py
social_auth/models.py