]> source.dussan.org Git - gitignore.git/commitdiff
Merge pull request #473 from Visgean/master
authorCarl Suster <carl@contraflo.ws>
Tue, 12 Nov 2013 00:45:53 +0000 (16:45 -0800)
committerCarl Suster <carl@contraflo.ws>
Tue, 12 Nov 2013 00:45:53 +0000 (16:45 -0800)
Merge the django template into the python one since there is a significant overlap

1  2 
Python.gitignore

Simple merge