diff options
| author | rinpatch <rinpatch@sdf.org> | 2019-02-16 17:39:04 +0000 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2019-02-16 17:39:04 +0000 |
| commit | 3b141194715e362d65482672d00b10991d102fa2 (patch) | |
| tree | 6ebdd6b8af5a1207ce80d20b8ae61c5f836c2896 /config | |
| parent | 1ce1b7b58dc0e009635c9dd6e2571df56c04f356 (diff) | |
| parent | 27375e55757a7034aa2ad6c94a8d6c82b1128b34 (diff) | |
| download | pleroma-3b141194715e362d65482672d00b10991d102fa2.tar.gz pleroma-3b141194715e362d65482672d00b10991d102fa2.zip | |
Merge branch 'welcome-message' into 'develop'
Add optional welcome message.
See merge request pleroma/pleroma!832
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/config/config.exs b/config/config.exs index e2a239a76..271224e85 100644 --- a/config/config.exs +++ b/config/config.exs @@ -162,7 +162,9 @@ config :pleroma, :instance, mrf_transparency: true, autofollowed_nicknames: [], max_pinned_statuses: 1, - no_attachment_links: false + no_attachment_links: false, + welcome_user_nickname: nil, + welcome_message: nil config :pleroma, :markup, # XXX - unfortunately, inline images must be enabled by default right now, because |