From: feld <feld@feld.me>
Date: Sat, 30 Jan 2021 17:41:08 +0000 (+0000)
Subject: Merge branch 'emoji-cache' into 'develop'
X-Git-Url: http://git.squeep.com/?a=commitdiff_plain;h=7ac0a819811496fe512544e91b6f0ff3d15b8856;hp=b794dae98a09cd1e18af60c1239f5c03b7193e57;p=akkoma

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 fac5a006e..f84b52a4f 100644
--- 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"]
       }
     ]
   },