Merge branch 'master' into rwd

[wolnelektury.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 8fa8179..3224d62 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,38 @@
-wolnelektury/localsettings.py
-wolnelektury/media/**/*
-.pyc
+localsettings.py
+dev.sqlite
+*.db
+*.db-journal
+*~
+*.orig
+*.log
+.sass-cache
+
+# Compress output
+/static
+
+# SCSS output
+/apps/wolnelektury_core/static/css/main/*.css
+
+# Python garbage
+*.pyc
+.coverage
+pip-log.txt
+nosetests.xml
+
+# Mac OS X garbage

 .DS_Store
 .DS_Store

+
+# Windows garbage
+thumbs.db
+
+# Eclipse
+.project
+.settings
+.pydevproject
+.tmp_*
+
+# Tags file
+TAGS
+
+media
+search_index