]> git.parisson.com Git - django-social-auth.git/commit
Merge branch 'estebistec'
authorMatías Aguirre <matiasaguirre@gmail.com>
Mon, 9 Jul 2012 04:47:37 +0000 (01:47 -0300)
committerMatías Aguirre <matiasaguirre@gmail.com>
Mon, 9 Jul 2012 04:47:37 +0000 (01:47 -0300)
commitce08404741beab7ccfc2e1ae671d59beb74c2c08
treea825299cca0470e2530f195d00070e20f40116a7
parente103fb55f865486892233fbb694127977a128029
parentacc18d804e93b247ddf7f5a20d588745c35c0ba4
Merge branch 'estebistec'

Conflicts:
README.rst
doc/contributions.rst
social_auth/models.py
README.rst
doc/configuration.rst
doc/contributions.rst
social_auth/backends/__init__.py
social_auth/backends/pipeline/associate.py
social_auth/db/base.py