Skip to content

Commit

Permalink
Merge branch 'master' into psa2
Browse files Browse the repository at this point in the history 
Conflicts:
	social_auth/backends/contrib/github.py
  • Loading branch information
@omab
omab committed Aug 29, 2013
2 parents eafa7b9 + 5b656f8 commit faa7f0a
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit faa7f0a

Please sign in to comment.