librarian bump with proper merge

[wolnelektury.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 944c338..230a876 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,7 @@ dev.sqlite
 *.db-journal
 *~
 *.orig
+*.log
 
 # Compress output
 /wolnelektury/static/css/all.min*.css
@@ -31,4 +32,6 @@ thumbs.db
 .tmp_*
 
 # Tags file
-TAGS
\ No newline at end of file
+TAGS
+
+media