From ee1878d3caad4c938a252d993d7583e66ad09d39 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <michal@cihar.com>
Date: Tue, 30 Aug 2016 14:04:55 +0200
Subject: [PATCH] Extend .gitignore
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes #12515

Signed-off-by: Michal Čihař <michal@cihar.com>
---
 .gitignore | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 6841414751..52a98f192f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,6 +7,7 @@
 # Upload/save dirs
 /upload/
 /save/
+/tmp/
 # For setup script
 /config/
 # ctags
@@ -22,8 +23,9 @@ phpmyadmin.wpj
 .idea
 .netbeans
 *.sw[op]
-# IIS files
+# Web server files
 web.config
+.htaccess
 # Locales
 /locale/
 # Backups