summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorEgor Kislitsyn <egor@kislitsyn.com>2019-01-09 17:02:30 +0700
committerEgor Kislitsyn <egor@kislitsyn.com>2019-01-09 17:02:30 +0700
commit28afcb7c31a357e05c6cb23645539389f37a15f4 (patch)
tree7d282e4f81c3f0fae8d0d8aca3b2f285cd3e2b50 /config
parent48591aab980d92823b51d2363fcd4b64d311739a (diff)
downloadpleroma-28afcb7c31a357e05c6cb23645539389f37a15f4.tar.gz
pleroma-28afcb7c31a357e05c6cb23645539389f37a15f4.zip
move defaults from sample_config.exs to config.exs
Diffstat (limited to 'config')
-rw-r--r--config/config.exs3
1 files changed, 2 insertions, 1 deletions
diff --git a/config/config.exs b/config/config.exs
index 4f4e2368a..9301758f0 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -138,7 +138,8 @@ config :pleroma, :instance,
],
finmoji_enabled: true,
mrf_transparency: true,
- autofollowed_nicknames: []
+ autofollowed_nicknames: [],
+ max_pinned_statuses: 1
config :pleroma, :markup,
# XXX - unfortunately, inline images must be enabled by default right now, because