Merge branch 'master' of https://github.com/jezdez/gitignore

defunkt · defunkt · commit b85d55793501 · 2010-11-10T00:39:08.000-08:00
diff --git a/Django.gitignore b/Django.gitignore
@@ -1,7 +1,3 @@
-#for python/django
 *.log
-static/uploaded/**/*
-*.mo
 *.pot
-*.pyc
-
+local_settings.py
