merge migrations,

[wolnelektury.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 38a691b..1befb63 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,13 +1,22 @@
 localsettings.py
 dev.sqlite
 *.db
 localsettings.py
 dev.sqlite
 *.db

+*.db-journal

 *~
 *.orig
 
 *~
 *.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