master to django-1.11#3

Merged

samwoodson merged 4 commits intoccn-2m:django-1.11from

arthanson:master

Jul 4, 2018

Commits on Dec 5, 2016

[-] Various updates
jsoa
committed

Commits on Apr 24, 2018

Merge pull request #41 from jsoa/master
arthanson
authored

Commits on Apr 25, 2018