Merge branch 'master' into rwd

[wolnelektury.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index c3e3e48..3224d62 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -5,10 +5,14 @@ dev.sqlite
 *~
 *.orig
 *.log
 *~
 *.orig
 *.log

+.sass-cache

 
 # Compress output
 /static
 
 
 # Compress output
 /static
 

+# SCSS output
+/apps/wolnelektury_core/static/css/main/*.css
+

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