Merge remote-tracking branch 'zawadzki/new-design'

[wolnelektury.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index ed1bedc..99c0898 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,5 @@
 localsettings.py
 dev.sqlite
-fabfile_local.py
 *.db
 *.db-journal
 *~
@@ -21,6 +20,7 @@ src/wolnelektury/static/scss/*.css
 coverage.xml
 pip-log.txt
 nosetests.xml
+/htmlcov
 
 # Mac OS X garbage
 .DS_Store
@@ -37,6 +37,10 @@ thumbs.db
 # PyCharm
 .idea
 
+# Emacs
+\#*\#
+.\#*
+
 # Tags file
 TAGS