From 38666fa7fa01458936cfeb413fe5ab2cdfb5d189 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcus=20M=C3=BCller?=
 <25648755+M-arcus@users.noreply.github.com>
Date: Tue, 15 May 2018 18:09:24 +0200
Subject: [PATCH] [BUGFIX] .htaccess: Rename file

---
 .gitignore                  | 3 ---
 .htaccess-dist => .htaccess | 0
 2 files changed, 3 deletions(-)
 rename .htaccess-dist => .htaccess (100%)

diff --git a/.gitignore b/.gitignore
index 12dd3b49ea..9de700d148 100644
--- a/.gitignore
+++ b/.gitignore
@@ -62,6 +62,3 @@ vendor/*
 
 #ignore addons/ directory
 addons/
-
-#Ignore .htaccess as it may contain local changes
-.htaccess
diff --git a/.htaccess-dist b/.htaccess
similarity index 100%
rename from .htaccess-dist
rename to .htaccess