Merge branch 'master' into sunburnt

[wolnelektury.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index d78f78f..c3e3e48 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,11 +1,19 @@
 localsettings.py
 dev.sqlite
 localsettings.py
 dev.sqlite

-dev.db
+*.db
+*.db-journal
+*~
+*.orig
+*.log
+
+# Compress output
+/static

 
 # 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


@@ -19,3 +27,8 @@ thumbs.db
 .pydevproject
 .tmp_*
 
 .pydevproject
 .tmp_*
 

+# Tags file
+TAGS
+
+media
+search_index