Merge branch 'master' into rwd

[wolnelektury.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 230a876..cceada8 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -5,13 +5,13 @@ dev.sqlite
 *~
 *.orig
 *.log
+.sass-cache
 
 # Compress output
-/wolnelektury/static/css/all.min*.css
-/wolnelektury/static/js/all*.min.js
-/wolnelektury/static/css/book.min*.css
-/wolnelektury/static/js/book*.min.js
-/wolnelektury/static/js/jquery.min.js
+/static
+
+# SCSS output
+apps/wolnelektury_core/static/scss/*.css
 
 # Python garbage
 *.pyc
@@ -35,3 +35,4 @@ thumbs.db
 TAGS
 
 media
+search_index