Merge branch 'patch-2' of github.com:jangeador/cookiecutter-django into patch-2

* 'patch-2' of github.com:jangeador/cookiecutter-django:
  Update .editorconfig
  Update .editorconfig
  Update nginx.conf
This commit is contained in:
Delio Castillo 2016-09-19 20:59:26 -07:00
commit 44e979a840

Diff Content Not Available