Merge remote-tracking branch 'remotes/thororm/master' into attachment-handling

# Conflicts: # tpl/bootstrap.php # tpl/page.php
2017-05-13 19:48:25 +02:00
parent b9075d7708 4f070d8fcf
commit 23f5dfbff8
16 changed files with 468 additions and 80 deletions
--- a/lib/Configuration.php
+++ b/lib/Configuration.php
@@ -42,6 +42,7 @@ class Configuration
            'password'                 => true,
            'fileupload'               => false,
            'burnafterreadingselected' => false,
+            'instantburnafterreading'  => false,
            'defaultformatter'         => 'plaintext',
            'syntaxhighlightingtheme'  => null,
            'sizelimit'                => 2097152,