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

[wolnelektury.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 1152ea7..a3f95c0 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,11 +1,21 @@
 localsettings.py
 dev.sqlite
 localsettings.py
 dev.sqlite

-dev.db
+*.db
+*~
+*.orig
+
+# Compress output
+/wolnelektury/static/css/all.min*.css
+/wolnelektury/static/js/all*.min.js
+/wolnelektury/static/css/book.min*.css
+/wolnelektury/static/js/book*.min.js
+/wolnelektury/static/js/jquery.min.js

 
 # Python garbage
 *.pyc
 .coverage
 pip-log.txt
 
 # Python garbage
 *.pyc
 .coverage
 pip-log.txt

+nosetests.xml

 
 # Mac OS X garbage
 .DS_Store
 
 # Mac OS X garbage
 .DS_Store


@@ -17,3 +27,5 @@ thumbs.db
 .project
 .settings
 .pydevproject
 .project
 .settings
 .pydevproject

+.tmp_*
+