george/PrivateBin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
# Conflicts:
#	tpl/bootstrap.php
#	tpl/page.php
This commit is contained in:
thororm
2017-05-13 19:48:25 +02:00
parent b9075d7708 4f070d8fcf
commit 23f5dfbff8
16 changed files with 468 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cfg/conf.ini.sample
View File

@@ -21,6 +21,10 @@ fileupload = false
; preselect the burn-after-reading feature, defaults to false
burnafterreadingselected = false
; delete a burn after reading paste immediatly after it is first accessed from
; the server and do not wait for a successful decryption
instantburnafterreading = false
; which display mode to preselect by default, defaults to "plaintext"
; make sure the value exists in [formatter_options]
defaultformatter = "plaintext"