Merge branch 'django1.7' into django1.8

* django1.7:
This commit is contained in:
Samuel Clay 2020-06-26 16:27:38 -04:00
commit 077b6de494

Diff content is not available