Merge branch 'master' of http://github.com/fnp/wolnelektury

[wolnelektury.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index d78f78f..ffdcd24 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,11 +1,19 @@
 localsettings.py
 dev.sqlite
-dev.db
+*.db
+*~
+*.orig
+
+# Compress output
+/wolnelektury/static/css/all.min*.css
+/wolnelektury/static/js/all*.min.js
+/wolnelektury/static/js/jquery.min.js
 
 # Python garbage
 *.pyc
 .coverage
 pip-log.txt
+nosetests.xml
 
 # Mac OS X garbage
 .DS_Store