diff options
| author | Egor Kislitsyn <egor@kislitsyn.com> | 2019-01-09 16:56:31 +0700 |
|---|---|---|
| committer | Egor Kislitsyn <egor@kislitsyn.com> | 2019-01-09 16:56:31 +0700 |
| commit | 48591aab980d92823b51d2363fcd4b64d311739a (patch) | |
| tree | 0bceebfbc8e96c7999683168b62b1e4f88272625 /config/config.exs | |
| parent | 0c750bc432a6329be7f0dc15707e46625b11faf3 (diff) | |
| parent | 5c5c8508c203886f32b150e7d8c1f7362a4fde0e (diff) | |
| download | pleroma-48591aab980d92823b51d2363fcd4b64d311739a.tar.gz pleroma-48591aab980d92823b51d2363fcd4b64d311739a.zip | |
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/pinned-posts
# Conflicts:
# docs/config.md
Diffstat (limited to 'config/config.exs')
| -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 e084d1a88..4f4e2368a 100644 --- a/config/config.exs +++ b/config/config.exs @@ -137,7 +137,8 @@ config :pleroma, :instance, "text/markdown" ], finmoji_enabled: true, - mrf_transparency: true + mrf_transparency: true, + autofollowed_nicknames: [] config :pleroma, :markup, # XXX - unfortunately, inline images must be enabled by default right now, because |