diff options
| author | rinpatch <rinpatch@sdf.org> | 2019-06-03 12:19:19 +0000 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2019-06-03 12:19:19 +0000 |
| commit | 9789e000b05621435dc0c03833f564481e0b80e6 (patch) | |
| tree | e2625834287cb13a3951c93886ae080ed58c1484 /config | |
| parent | d33d248b69c77a7ab712cfe4b727c0000a77f4ea (diff) | |
| parent | dc91bcc0afc82ddd52a617352e0e4e89e1a1d61c (diff) | |
| download | pleroma-9789e000b05621435dc0c03833f564481e0b80e6.tar.gz pleroma-9789e000b05621435dc0c03833f564481e0b80e6.zip | |
Merge branch 'feature/polls-2-electric-boogalo' into 'develop'
Polls 2 Electric Boogalo
Closes #657
See merge request pleroma/pleroma!1190
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/config/config.exs b/config/config.exs index 68168b279..09c3be7de 100644 --- a/config/config.exs +++ b/config/config.exs @@ -208,6 +208,12 @@ config :pleroma, :instance, avatar_upload_limit: 2_000_000, background_upload_limit: 4_000_000, banner_upload_limit: 4_000_000, + poll_limits: %{ + max_options: 20, + max_option_chars: 200, + min_expiration: 0, + max_expiration: 365 * 24 * 60 * 60 + }, registrations_open: true, federating: true, federation_reachability_timeout_days: 7, |