cuts release from staging #905

Merged
jessopb merged 31 commits from staging into release 2019-02-11 02:48:48 +01:00
Showing only changes of commit 5063ce0724 - Show all commits

View file

@ -23,6 +23,7 @@
"publishing": { "publishing": {
"primaryClaimAddress": null, "primaryClaimAddress": null,
"uploadDirectory": "/home/lbry/Uploads", "uploadDirectory": "/home/lbry/Uploads",
"lbrynetHome": "/home/lbry",
"thumbnailChannel": null, "thumbnailChannel": null,
"thumbnailChannelId": null, "thumbnailChannelId": null,
"additionalClaimAddresses": [], "additionalClaimAddresses": [],
@ -39,6 +40,18 @@
"maxSizeGif": 50000000, "maxSizeGif": 50000000,
"maxSizeVideo": 50000000 "maxSizeVideo": 50000000
}, },
"serving": {
"markdownSettings": {
"skipHtml": true,
"privilegedDisallowedTypesDescriptions": ["Image"],
"privilegedDisallowedTypesMain": [],
"publicDisallowedTypesDescriptions": ["Image"],
"publicDisallowedTypesMain": []
},
"customFileExtensions": {
"application/example-type": "example"
}
},
"startup": { "startup": {
"performChecks": true, "performChecks": true,
"performUpdates": true "performUpdates": true