Merge branch 'master' into attachment-handling

# Conflicts: # js/privatebin.js # tpl/bootstrap.php # tpl/page.php
2017-04-02 13:30:52 +02:00
parent b9737d368d f25ea35666
commit 096f07f86e
60 changed files with 4651 additions and 2100 deletions
--- 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