Merge branch 'production' into pretty

[wolnelektury.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index a3f95c0..230a876 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,10 @@
 localsettings.py
 dev.sqlite
 *.db
+*.db-journal
 *~
 *.orig
+*.log
 
 # Compress output
 /wolnelektury/static/css/all.min*.css
@@ -29,3 +31,7 @@ thumbs.db
 .pydevproject
 .tmp_*
 
+# Tags file
+TAGS
+
+media