Merge branch 'develop' into feature/digest-email

2019-06-03 15:29:53 -05:00 · 2019-06-03 15:29:53 -05:00 · 6ef145b4fc
commit 6ef145b4fc
parent 5cee2fe9fe 662e95e948
73 changed files with 2589 additions and 518 deletions
--- 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,