Skip to content

Commit

Permalink
Merge branch 'master' into psa2
Browse files Browse the repository at this point in the history 
Conflicts:
	social_auth/__init__.py
  • Loading branch information
@omab
omab committed Aug 30, 2013
2 parents 0cf3daf + 81c6920 commit 24d96e9
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit 24d96e9

Please sign in to comment.