summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2020-05-17 07:26:51 +0000
committerlain <lain@soykaf.club>2020-05-17 07:26:51 +0000
commit4b28d812cff3d8c1f6e78ab7a975ae8552bfc0ef (patch)
tree0680c83f613bd0a6a14f33cfe42a9b4493fa31a1 /config
parentd96f8f17e82147c50b3413c3739f5023a5daa834 (diff)
parent8062d590ddf3798616fe66e99574f925cc3b8c5e (diff)
downloadpleroma-4b28d812cff3d8c1f6e78ab7a975ae8552bfc0ef.tar.gz
pleroma-4b28d812cff3d8c1f6e78ab7a975ae8552bfc0ef.zip
Merge branch 'restricted-relations-embedding' into 'develop'
Restricted support for embedded relationships See merge request pleroma/pleroma!2456
Diffstat (limited to 'config')
-rw-r--r--config/config.exs2
1 files changed, 0 insertions, 2 deletions
diff --git a/config/config.exs b/config/config.exs
index e703c1632..c51884f3a 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -251,8 +251,6 @@ config :pleroma, :instance,
]
]
-config :pleroma, :extensions, output_relationships_in_statuses_by_default: true
-
config :pleroma, :feed,
post_title: %{
max_length: 100,