Merge branch 'master' into rwd

[wolnelektury.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index ffdcd24..3224d62 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,13 +1,17 @@
 localsettings.py
 dev.sqlite
 *.db
 localsettings.py
 dev.sqlite
 *.db

+*.db-journal

 *~
 *.orig
 *~
 *.orig

+*.log
+.sass-cache

 
 # Compress output
 
 # Compress output

-/wolnelektury/static/css/all.min*.css
-/wolnelektury/static/js/all*.min.js
-/wolnelektury/static/js/jquery.min.js
+/static
+
+# SCSS output
+/apps/wolnelektury_core/static/css/main/*.css

 
 # Python garbage
 *.pyc
 
 # Python garbage
 *.pyc


@@ -27,3 +31,8 @@ thumbs.db
 .pydevproject
 .tmp_*
 
 .pydevproject
 .tmp_*
 

+# Tags file
+TAGS
+
+media
+search_index