Merge pull request #473 from Visgean/master

Merge the django template into the python one since there is a significant overlap
2013-11-11 16:45:53 -08:00 · 2013-11-11 16:45:53 -08:00 · 09793dd34e
commit 09793dd34e
parent e105d8c4b2 33b416dc00
2 changed files with 5 additions and 4 deletions
--- a/Django.gitignore
+++ b/Django.gitignore
@ -1,4 +0,0 @@
 *.log
 *.pot
 *.pyc
 local_settings.py
--- a/Python.gitignore
+++ b/Python.gitignore
@ -37,3 +37,8 @@ coverage.xml
 .mr.developer.cfg
 .project
 .pydevproject
 -# Django stuff:
 -*.log
 -*.pot