diff options
| author | Shpuld Shpludson <shp@cock.li> | 2020-05-20 14:42:29 +0000 |
|---|---|---|
| committer | Shpuld Shpludson <shp@cock.li> | 2020-05-20 14:42:29 +0000 |
| commit | d53a4a754f88897001f63816ab1eeb3f808db435 (patch) | |
| tree | 64e38ce7827001ee362411730e30dd7ab66465c1 | |
| parent | bc9ed3642441fa77900d4698eebf8cd6380ccaaa (diff) | |
| parent | 840c6f40b6a70f345d8ccfae039f449c9434b57c (diff) | |
Merge branch 'chore/remote-unused-option' into 'develop'
Remove unused noAttachmentLinks option
See merge request pleroma/pleroma-fe!1109
| -rw-r--r-- | src/boot/after_store.js | 1 | ||||
| -rw-r--r-- | static/config.json | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/src/boot/after_store.js b/src/boot/after_store.js index 34f6d6e7..abdba305 100644 --- 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 index 727dde73..74947314 100644 --- 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", |