summaryrefslogtreecommitdiff
path: root/config/description.exs
diff options
context:
space:
mode:
authorMark Felder <feld@FreeBSD.org>2019-10-18 17:56:15 -0500
committerMark Felder <feld@FreeBSD.org>2019-10-18 17:56:15 -0500
commitdcb23a85b6b05db4958b82ad14083cfa8577f477 (patch)
treecc8197a3780fcab86a10b1055501ba570b8e0c3b /config/description.exs
parent152caef51d69ba4a47ac59346c782dfff8488f8b (diff)
parent5c6c3026ea7bd20cb2c10f6e2e34a54734d2509e (diff)
downloadpleroma-dcb23a85b6b05db4958b82ad14083cfa8577f477.tar.gz
pleroma-dcb23a85b6b05db4958b82ad14083cfa8577f477.zip
Merge branch 'develop' into feature/push-subject-for-dm
Diffstat (limited to 'config/description.exs')
-rw-r--r--config/description.exs4
1 files changed, 1 insertions, 3 deletions
diff --git a/config/description.exs b/config/description.exs
index b007cf69c..571c64bc1 100644
--- a/config/description.exs
+++ b/config/description.exs
@@ -581,9 +581,7 @@ config :pleroma, :config_description, [
type: [:list, :module],
description: "List of modules for federation publishing",
suggestions: [
- Pleroma.Web.ActivityPub.Publisher,
- Pleroma.Web.Websub,
- Pleroma.Web.Salmo
+ Pleroma.Web.ActivityPub.Publisher
]
},
%{