diff options
| author | Tusooa Zhu <tusooa@kazv.moe> | 2022-07-03 22:24:57 +0000 |
|---|---|---|
| committer | Tusooa Zhu <tusooa@kazv.moe> | 2022-07-03 22:24:57 +0000 |
| commit | 4edc867b87362475a8cd749257e5d29c431467b4 (patch) | |
| tree | 8805651d07c82f48c2935dcdf598016045a1813d /config | |
| parent | 014096aeefe88348323db74e2ab7f81e0184bfee (diff) | |
| parent | c50ade26ba9f63802512a745107de66aba59e9fe (diff) | |
| download | pleroma-4edc867b87362475a8cd749257e5d29c431467b4.tar.gz pleroma-4edc867b87362475a8cd749257e5d29c431467b4.zip | |
Merge branch 'develop' into 'from/upstream-develop/tusooa/edits'
# Conflicts:
# lib/pleroma/constants.ex
Diffstat (limited to 'config')
| -rw-r--r-- | config/description.exs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/description.exs b/config/description.exs index 704af8f68..7caad18b4 100644 --- a/config/description.exs +++ b/config/description.exs @@ -2726,7 +2726,7 @@ config :pleroma, :config_description, [ key: :versions, type: {:list, :atom}, description: "List of TLS version to use", - suggestions: [:tlsv1, ":tlsv1.1", ":tlsv1.2"] + suggestions: [:tlsv1, ":tlsv1.1", ":tlsv1.2", ":tlsv1.3"] } ] } |