Merge branch 'master' of ssh://s.mdrn.pl:2224/srv/redakcja.wolnelektury.pl/git

[redakcja.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index e5d43c7..2694315 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -2,7 +2,8 @@ localsettings.py
 dev.sqlite
 requirements.pybundle
 *~
-*.orig
+*.swp
+.*.orig
 /redakcja/media
 /static
 .sass-cache
@@ -13,8 +14,8 @@ var
 .coverage
 .coveragerc
 coverage.xml
-nosetests.xml
 pip-log.txt
+/htmlcov
 
 # Mac OS X garbage
 .DS_Store
@@ -37,4 +38,4 @@ nbproject/*
 node_modules
 
 /static_test
-chromedriver.log
\ No newline at end of file
+chromedriver.log