]> git.parisson.com Git - django-social-auth.git/commit
Merge remote-tracking branch 'niQo/master'
authorMatías Aguirre <matiasaguirre@gmail.com>
Sat, 28 Apr 2012 08:52:34 +0000 (05:52 -0300)
committerMatías Aguirre <matiasaguirre@gmail.com>
Sat, 28 Apr 2012 08:52:34 +0000 (05:52 -0300)
commit8598de24abf3d6aa283a460d34da3ed22e3b77c3
tree7f4a665f6fcf968fcf7a750003f0af80131e5baf
parent7de6051e15c436b3f58f12cc7634e18012b3e180
parenta5c134943e13d34f73c2360f7b67dc3a9b1e7be9
Merge remote-tracking branch 'niQo/master'

Conflicts:
README.rst
doc/backends/index.rst
doc/configuration.rst
doc/intro.rst
README.rst
doc/backends/index.rst
doc/configuration.rst
doc/intro.rst
example/local_settings.py.template
example/settings.py