commit: d53a4a754f88897001f63816ab1eeb3f808db435
parent: bc9ed3642441fa77900d4698eebf8cd6380ccaaa
Author: Shpuld Shpludson <shp@cock.li>
Date: Wed, 20 May 2020 14:42:29 +0000
Merge branch 'chore/remote-unused-option' into 'develop'
Remove unused noAttachmentLinks option
See merge request pleroma/pleroma-fe!1109
Diffstat:
2 files changed, 0 insertions(+), 2 deletions(-)
diff --git a/src/boot/after_store.js b/src/boot/after_store.js
@@ -108,7 +108,6 @@ const setSettings = async ({ apiConfig, staticConfig, store }) => {
copyInstanceOption('subjectLineBehavior')
copyInstanceOption('postContentType')
copyInstanceOption('alwaysShowSubjectInput')
- copyInstanceOption('noAttachmentLinks')
copyInstanceOption('showFeaturesPanel')
copyInstanceOption('hideSitename')
diff --git a/static/config.json b/static/config.json
@@ -14,7 +14,6 @@
"logoMargin": ".1em",
"logoMask": true,
"minimalScopesMode": false,
- "noAttachmentLinks": false,
"nsfwCensorImage": "",
"postContentType": "text/plain",
"redirectRootLogin": "/main/friends",