Merge branch 'master' into search

[prawokultury.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index c3e3e48..5818dca 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
-localsettings.py
+*/settings.d/local.conf

 dev.sqlite
 *.db
 *.db-journal
 dev.sqlite
 *.db
 *.db-journal


@@ -32,3 +32,5 @@ TAGS
 
 media
 search_index
 
 media
 search_index

+.sass-cache
+