diff options
| author | Roman Chvanikov <roman@Romans-MacBook-Pro-2.local> | 2019-06-05 02:45:21 +0300 |
|---|---|---|
| committer | Roman Chvanikov <roman@Romans-MacBook-Pro-2.local> | 2019-06-05 02:45:21 +0300 |
| commit | b1b1a270e8f17b76d08771ca1e4025b1d227da05 (patch) | |
| tree | 41a5896012a3f55f3de31f7ec97dc397ba02cd62 /lib/pleroma/web/nodeinfo/nodeinfo_controller.ex | |
| parent | f6036ce3b9649902ce1c2af819616ad25f0caef1 (diff) | |
| parent | 5188add534a1532ef323a0fec3503f8e96dfe762 (diff) | |
| download | pleroma-b1b1a270e8f17b76d08771ca1e4025b1d227da05.tar.gz | |
Fix conflict
Diffstat (limited to 'lib/pleroma/web/nodeinfo/nodeinfo_controller.ex')
| -rw-r--r-- | lib/pleroma/web/nodeinfo/nodeinfo_controller.ex | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/pleroma/web/nodeinfo/nodeinfo_controller.ex b/lib/pleroma/web/nodeinfo/nodeinfo_controller.ex index 59f3d4e11..57f5b61bb 100644 --- a/lib/pleroma/web/nodeinfo/nodeinfo_controller.ex +++ b/lib/pleroma/web/nodeinfo/nodeinfo_controller.ex @@ -97,6 +97,7 @@ defmodule Pleroma.Web.Nodeinfo.NodeinfoController do "pleroma_api", "mastodon_api", "mastodon_api_streaming", + "polls", if Config.get([:media_proxy, :enabled]) do "media_proxy" end, @@ -149,6 +150,7 @@ defmodule Pleroma.Web.Nodeinfo.NodeinfoController do }, staffAccounts: staff_accounts, federation: federation_response, + pollLimits: Config.get([:instance, :poll_limits]), postFormats: Config.get([:instance, :allowed_post_formats]), uploadLimits: %{ general: Config.get([:instance, :upload_limit]), |