From a93b620a35a9768e102de31f19552624f33a0ae0 Mon Sep 17 00:00:00 2001
From: VirtualTam <virtualtam@flibidi.net>
Date: Mon, 16 Oct 2017 19:38:33 +0200
Subject: [PATCH 1/2] EditorConfig: add .htaccess support

Signed-off-by: VirtualTam <virtualtam@flibidi.net>
---
 .editorconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.editorconfig b/.editorconfig
index 5abbd7b..4a6589a 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -10,7 +10,7 @@ trim_trailing_whitespace = true
 indent_style = space
 indent_size = 4
 
-[*.{html,xml}]
+[*.{htaccess,html,xml}]
 indent_size = 2
 
 [*.php]

From 710291b164421663b9b1cf1f866e957801ff83e0 Mon Sep 17 00:00:00 2001
From: VirtualTam <virtualtam@flibidi.net>
Date: Mon, 16 Oct 2017 19:39:16 +0200
Subject: [PATCH 2/2] Fix: enable access to data/user.css (Apache 2.2 & 2.4)

Relates to https://github.com/shaarli/Shaarli/issues/872
Relates to https://github.com/shaarli/Shaarli/issues/993

Signed-off-by: VirtualTam <virtualtam@flibidi.net>
---
 data/.htaccess | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/data/.htaccess b/data/.htaccess
index f601c1e..1d49da3 100644
--- a/data/.htaccess
+++ b/data/.htaccess
@@ -1,10 +1,16 @@
 <IfModule version_module>
   <IfVersion >= 2.4>
-     Require all denied
+    Require all denied
+    <Files "user.css">
+      Require all granted
+    </Files>
   </IfVersion>
   <IfVersion < 2.4>
-     Allow from none
-     Deny from all
+    Allow from none
+    Deny from all
+    <Files "user.css">
+      Allow from all
+    </Files>
   </IfVersion>
 </IfModule>