Merge branch 'master' into production

[redakcja.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index a5d4864..0d55584 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,30 @@
 localsettings.py
 dev.sqlite
+requirements.pybundle
+*~
+*.orig
+
+# Python garbage
 *.pyc
-.*.swp
+.coverage
+.coveragerc
+coverage.xml
+nosetests.xml
+pip-log.txt
+
+# Mac OS X garbage
 .DS_Store
-media
-files
+
+# Windows garbage
+thumbs.db
+
+# Netbeans garbage
+nbproject
+nbproject/*
+
+# Eclipse
+.project
+.pydevproject
+.settings
+platforma/static/compressed
+platforma/static/compressed/*