Merge branch 'master' of http://github.com/fnp/wolnelektury

[wolnelektury.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index a2cfd24..ffdcd24 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,29 @@
-wolnelektury/localsettings.py
-wolnelektury/media/**/*
+localsettings.py
+dev.sqlite
+*.db
+*~
+*.orig
+
+# Compress output
+/wolnelektury/static/css/all.min*.css
+/wolnelektury/static/js/all*.min.js
+/wolnelektury/static/js/jquery.min.js
+
+# Python garbage
+*.pyc
+.coverage
+pip-log.txt
+nosetests.xml
+
+# Mac OS X garbage
 .DS_Store
+
+# Windows garbage
+thumbs.db
+
+# Eclipse
+.project
+.settings
+.pydevproject
+.tmp_*
+