wip: migrating to django 1.7
wip: migrating to django 1.7
migrated to django 1.7
Merge branch 'django-1.7' into develop