Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'master' into psa2

Conflicts:
	social_auth/backends/__init__.py
	social_auth/db/base.py
	social_auth/exceptions.py
  • Loading branch information...
commit 1f0c1da7e0027bde49b1a40bc79e0d9bfce1a605 2 parents ef5aaa4 + abb511f
@omab authored
Showing with 0 additions and 0 deletions.
Please sign in to comment.
Something went wrong with that request. Please try again.