diff options
| author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-05-10 09:17:16 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-05-10 09:17:16 +0300 |
| commit | b0d0d8f91b242a2975a755f0ddeaec9f016d2d18 (patch) | |
| tree | 681048f2df992934a80ca5e5ad10c3ad17474a66 /config | |
| parent | aee88d11be898921d79ad7f1481ab055190f4dfd (diff) | |
| parent | b3e6953d23250393010adb01fc604f97fd17eb96 (diff) | |
| download | pleroma-b0d0d8f91b242a2975a755f0ddeaec9f016d2d18.tar.gz pleroma-b0d0d8f91b242a2975a755f0ddeaec9f016d2d18.zip | |
Merge remote-tracking branch 'remotes/origin/develop' into restricted-relations-embedding
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 39e094082..504161a9f 100644 --- a/config/description.exs +++ b/config/description.exs @@ -712,7 +712,7 @@ config :pleroma, :config_description, [ key: :quarantined_instances, type: {:list, :string}, description: - "List of ActivityPub instances where private (DMs, followers-only) activities will not be send", + "List of ActivityPub instances where private (DMs, followers-only) activities will not be sent", suggestions: [ "quarantined.com", "*.quarantined.com" |