diff options
| author | kaniini <nenolod@gmail.com> | 2019-01-10 02:39:53 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2019-01-10 02:39:53 +0000 |
| commit | 7f5efddd6ed60fead5b456186b67a96dde95e6b9 (patch) | |
| tree | 3eff28d7cb47c7fb5e4bd61ab2f8a4cddf0b530e /config | |
| parent | f85d108c4181fbccf417f47d15915706c457cf1c (diff) | |
| parent | 6cbe63726d298ae85a75efa7591a54394469525e (diff) | |
| download | pleroma-7f5efddd6ed60fead5b456186b67a96dde95e6b9.tar.gz pleroma-7f5efddd6ed60fead5b456186b67a96dde95e6b9.zip | |
Merge branch 'feature/pinned-posts' into 'develop'
Pinned Statuses
Closes #440
See merge request pleroma/pleroma!636
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/config/config.exs b/config/config.exs index 9f0f4cd4f..1c55807b7 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 |