diff options
| author | kaniini <nenolod@gmail.com> | 2019-05-13 18:35:45 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2019-05-13 18:35:45 +0000 |
| commit | f3e8f5b1f208b10130c7123e68af1e38575f180b (patch) | |
| tree | 523d1f1cfa399f4ee6d841ba3098ecd87d8e67e7 /config | |
| parent | 5a4d55cf910f85b07f111972647a8b4410b5eb6b (diff) | |
| parent | a2be420f940fb8f181feeb9b0fb9759d433dcae1 (diff) | |
| download | pleroma-f3e8f5b1f208b10130c7123e68af1e38575f180b.tar.gz pleroma-f3e8f5b1f208b10130c7123e68af1e38575f180b.zip | |
Merge branch 'features/mastoapi/2.7.0-registration' into 'develop'
Features/mastoapi/2.7.0 registration
Closes #773
See merge request pleroma/pleroma!1134
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/config/config.exs b/config/config.exs index 1e64b79a7..e8aad855c 100644 --- a/config/config.exs +++ b/config/config.exs @@ -234,6 +234,8 @@ config :pleroma, :instance, safe_dm_mentions: false, healthcheck: false +config :pleroma, :app_account_creation, enabled: false, max_requests: 5, interval: 1800 + config :pleroma, :markup, # XXX - unfortunately, inline images must be enabled by default right now, because # of custom emoji. Issue #275 discusses defanging that somehow. |