Merge branch 'mass_edit'

[redakcja.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index a73fc81..0d55584 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,10 +1,16 @@
 localsettings.py
 dev.sqlite
 requirements.pybundle
+*~
+*.orig
 
 # Python garbage
 *.pyc
 .coverage
+.coveragerc
+coverage.xml
+nosetests.xml
+pip-log.txt
 
 # Mac OS X garbage
 .DS_Store
@@ -20,3 +26,5 @@ nbproject/*
 .project
 .pydevproject
 .settings
+platforma/static/compressed
+platforma/static/compressed/*