Fixes for Django 1.7 compatibility#25

Open

morlandi wants to merge 2 commits intoInviteBox:masterfrom

morlandi:master

Commits on Oct 1, 2014

Fixes for Django 1.7 compatibility
morlandi
committed

Commits on Oct 5, 2014

Restore backward compatibility for older versions of Django
morlandi
committed