Merge branch 'master' into jsrefactor

2017-03-13 21:13:06 +01:00 · 2017-03-13 21:13:06 +01:00 · 63617ade72
commit 63617ade72
parent b5cdfff3e3 be0919893d
7 changed files with 6 additions and 5 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,6 +1,7 @@
 # Ignore server files for safety
 .htaccess
 .htpasswd
+cfg/conf.ini

 # Ignore data/
 data/
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -4,6 +4,7 @@
    * ADDED: Translations for Spanish, Occitan, Norwegian and Portuguese
    * ADDED: Option in configuration to change the default "PrivateBin" title of the site
    * CHANGED: Minimum required PHP version is 5.4 (#186)
+    * CHANGED: Shipped .htaccess files were updated for Apache 2.4 (#192)
    * CHANGED: Cleanup of bootstrap template variants and moved icons to `img` directory
  * **1.1 (2016-12-26)**
    * ADDED: Translations for Italian and Russian
--- a/cfg/.gitignore
+++ b/cfg/.gitignore
@ -1 +0,0 @@
-/conf.ini
--- a/cfg/.htaccess
+++ b/cfg/.htaccess
@ -1,2 +1 @@
-Allow from none
-Deny from all
+Require all denied
--- a/lib/.htaccess
+++ b/lib/.htaccess
@ -1,2 +1 @@
-Allow from none
-Deny from all
+Require all denied
--- a/tpl/.htaccess
+++ b/tpl/.htaccess
@ -0,0 +1 @@
+Require all denied
--- a/vendor/.htaccess
+++ b/vendor/.htaccess
@ -0,0 +1 @@
+Require all denied