all-in-one#16

Open

rizumu wants to merge 16 commits intogpennington:developfrom

Commits on Jun 16, 2014

flake8 the project
Thomas Schreiber
committed
Updated for django 1.6 support

sebslomski
authored and
Thomas Schreiber
committed
Updated for django 1.6

sebslomski
authored and
Thomas Schreiber
committed
removed simplejson

sebslomski
authored and
Thomas Schreiber
committed
rename mimetype for content_type, django 1.7 compatibility
Thomas Schreiber
committed
allow checking a custom username
Thomas Schreiber
committed
Merge branch 'lint' into rizumu
Thomas Schreiber
committed
Merge branch 'django1.6' into rizumu
Thomas Schreiber
committed
Merge branch 'django-1.7' into rizumu
Thomas Schreiber
committed
Merge branch 'custom-username' into rizumu
Thomas Schreiber
committed
update variable for 1.7
Thomas Schreiber
committed
resolve merge
Thomas Schreiber
committed
support custom user model
Thomas Schreiber
committed
a smarter known user exists
Thomas Schreiber
committed
Merge branch 'django-1.7' into rizumu
Thomas Schreiber
committed
Merge branch 'custom-username' into rizumu
Thomas Schreiber
committed