Merge branch 'master' into view-refactor

[redakcja.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 41d16d7..c91e29e 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,10 @@
 localsettings.py
 dev.sqlite
 *.pyc
 localsettings.py
 dev.sqlite
 *.pyc

+.*.swp

 .DS_Store
 .DS_Store

+media
+files
+nbproject
+nbproject/*
+.coverage