[Python-modules-commits] [python-social-auth] 110/131: Merge branch 'master' of https://github.com/shepilov-vladislav/python-social-auth into shepilov-vladislav-master

[Wolfgang Borgert]

This is an automated email from the git hooks/post-receive script.

debacle pushed a commit to tag v0.2.20
in repository python-social-auth.

commit f0304de4c4cadcb39f821e7e2f0cb0232d1f913f
Merge: e60260e 3ae8e70
Author: Matías Aguirre <matiasaguirre at gmail.com>
Date:   Sat Aug 6 05:08:24 2016 -0300

    Merge branch 'master' of https://github.com/shepilov-vladislav/python-social-auth into shepilov-vladislav-master

 docs/backends/index.rst                            |  1 +
 docs/backends/upwork.rst                           | 28 ++++++++++++
 docs/intro.rst                                     |  2 +
 .../cherrypy_example/local_settings.py.template    |  1 +
 examples/django_example/example/settings.py        |  1 +
 examples/django_me_example/example/settings.py     |  1 +
 examples/flask_example/settings.py                 |  1 +
 examples/flask_me_example/settings.py              |  1 +
 examples/pyramid_example/example/settings.py       |  1 +
 examples/tornado_example/settings.py               |  1 +
 examples/webpy_example/app.py                      |  1 +
 social/backends/upwork.py                          | 35 ++++++++++++++
 social/tests/backends/test_upwork.py               | 53 ++++++++++++++++++++++
 13 files changed, 127 insertions(+)

diff --cc docs/backends/index.rst
index e0e6eae,43a9d5e..9943c70
--- a/docs/backends/index.rst
+++ b/docs/backends/index.rst
@@@ -141,7 -139,7 +141,8 @@@ Social backend
     twitch
     twitter
     uber
 +   untappd
+    upwork
     vend
     vimeo
     vk

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-social-auth.git