Merge branch 'master' into rwd

[wolnelektury.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 944c338..3224d62 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -4,13 +4,14 @@ dev.sqlite
 *.db-journal
 *~
 *.orig
 *.db-journal
 *~
 *.orig

+*.log
+.sass-cache

 
 # Compress output
 
 # 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/css/main/*.css

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


@@ -31,4 +32,7 @@ thumbs.db
 .tmp_*
 
 # Tags file
 .tmp_*
 
 # Tags file

-TAGS
\ No newline at end of file
+TAGS
+
+media
+search_index