summaryrefslogtreecommitdiff
path: root/config/config.exs
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2020-05-17 12:14:49 +0200
committerlain <lain@soykaf.club>2020-05-17 12:14:49 +0200
commit9c171097653abce49b9847fff66bc39b35719a1c (patch)
treee89ab9245f0844bfb3334f62f67f8ab9f0949580 /config/config.exs
parentf012c3a202ef43d1a8a1dc88f08057b7a41d3d78 (diff)
parentb0ccdb5af4baa119b336298d38f34746cdce0111 (diff)
downloadpleroma-9c171097653abce49b9847fff66bc39b35719a1c.tar.gz
pleroma-9c171097653abce49b9847fff66bc39b35719a1c.zip
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
Diffstat (limited to 'config/config.exs')
-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,