Merge branch 'emoji-cache' into 'develop'

Emoji cache

Closes #2468

See merge request pleroma/pleroma!3291

diff --git a/config/description.exs b/config/description.exs
index fac5a006e9b6538e26ff17905687638be2934402..f84b52a4f6904822f75f037990a2aeacf38b09c7 100644 (file)
--- a/config/description.exs
+++ b/config/description.exs
@@ -3224,6 +3224,12 @@ config :pleroma, :config_description, [
         type: :string,
         description: "S3 host",
         suggestions: ["s3.eu-central-1.amazonaws.com"]
+      },
+      %{
+        key: :region,
+        type: :string,
+        description: "S3 region (for AWS)",
+        suggestions: ["us-east-1"]
       }
     ]
   },