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

b85d5579 · Chris Wanstrath · 66555ace · 42d3cf08 · b85d5579
Commit b85d5579 authored Nov 10, 2010 by Chris Wanstrath
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 5 deletions

Django.gitignore Django.gitignore +1 -5

No files found.
--- a/Django.gitignore
+++ b/Django.gitignore
-#for python/django
 *.log
-static/uploaded/**/*
-*.mo
 *.pot
-*.pyc
+local_settings.py