Merge branch 'master' into production

[redakcja.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index a1290ed..0d55584 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -2,10 +2,12 @@ localsettings.py
 dev.sqlite
 requirements.pybundle
 *~
+*.orig
 
 # Python garbage
 *.pyc
 .coverage
+.coveragerc
 coverage.xml
 nosetests.xml
 pip-log.txt