Merge remote-tracking branch 'origin/master'

2017-12-27 20:23:48 +01:00 · 2017-12-27 20:23:48 +01:00 · 204de05622
commit 204de05622
parent a056b1c750 e82e70b084
1 changed files with 2 additions and 0 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,3 +1,5 @@
+*.log
+logs
 *~
 \#*#
 .*.swp