Merge pull request #473 from Visgean/master

Merge the django template into the python one since there is a significant overlap
This commit is contained in:
Carl Suster 2013-11-11 16:45:53 -08:00
commit 09793dd34e
2 changed files with 5 additions and 4 deletions

View File

@ -1,4 +0,0 @@
*.log
*.pot
*.pyc
local_settings.py

View File

@ -37,3 +37,8 @@ coverage.xml
.mr.developer.cfg .mr.developer.cfg
.project .project
.pydevproject .pydevproject
-# Django stuff:
-*.log
-*.pot