diff options
| author | feld <feld@feld.me> | 2021-02-02 17:57:58 +0000 |
|---|---|---|
| committer | feld <feld@feld.me> | 2021-02-02 17:57:58 +0000 |
| commit | d289ad8579dacdf1459bbbdaf404bfcd042255ae (patch) | |
| tree | da6bfbe54853ad66dd81763e7b8d3be3b121a2a3 /config/description.exs | |
| parent | c369d2b93028e4dc11f1f2c4cd7380ee0392ccac (diff) | |
| parent | 6a2d3fb9a3775fc0e167c71bb8a8fba3608b2f17 (diff) | |
| download | pleroma-d289ad8579dacdf1459bbbdaf404bfcd042255ae.tar.gz pleroma-d289ad8579dacdf1459bbbdaf404bfcd042255ae.zip | |
Merge branch 'develop' into 'fix/2411-mutes-api'
# Conflicts:
# CHANGELOG.md
# docs/development/API/differences_in_mastoapi_responses.md
Diffstat (limited to 'config/description.exs')
| -rw-r--r-- | config/description.exs | 6 |
1 files changed, 6 insertions, 0 deletions
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"] } ] }, |