Merge branch 'master' into jsrefactor

This commit is contained in:
El RIDO 2017-03-13 21:13:06 +01:00
commit 63617ade72
No known key found for this signature in database
GPG Key ID: 0F5C940A6BD81F92
7 changed files with 6 additions and 5 deletions

1
.gitignore vendored
View File

@ -1,6 +1,7 @@
# Ignore server files for safety # Ignore server files for safety
.htaccess .htaccess
.htpasswd .htpasswd
cfg/conf.ini
# Ignore data/ # Ignore data/
data/ data/

View File

@ -4,6 +4,7 @@
* ADDED: Translations for Spanish, Occitan, Norwegian and Portuguese * ADDED: Translations for Spanish, Occitan, Norwegian and Portuguese
* ADDED: Option in configuration to change the default "PrivateBin" title of the site * ADDED: Option in configuration to change the default "PrivateBin" title of the site
* CHANGED: Minimum required PHP version is 5.4 (#186) * 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 * CHANGED: Cleanup of bootstrap template variants and moved icons to `img` directory
* **1.1 (2016-12-26)** * **1.1 (2016-12-26)**
* ADDED: Translations for Italian and Russian * ADDED: Translations for Italian and Russian

1
cfg/.gitignore vendored
View File

@ -1 +0,0 @@
/conf.ini

View File

@ -1,2 +1 @@
Allow from none Require all denied
Deny from all

View File

@ -1,2 +1 @@
Allow from none Require all denied
Deny from all

1
tpl/.htaccess Normal file
View File

@ -0,0 +1 @@
Require all denied

1
vendor/.htaccess vendored Normal file
View File

@ -0,0 +1 @@
Require all denied