diff options
| author | Roman Chvanikov <chvanikoff@pm.me> | 2020-05-09 11:31:34 +0300 |
|---|---|---|
| committer | Roman Chvanikov <chvanikoff@pm.me> | 2020-05-09 11:31:34 +0300 |
| commit | 942093683a1e6b3f3d3692268b2af8390da6d325 (patch) | |
| tree | 3ad22c9d4d06716f469925b7c15a30e9f0e25c57 /config | |
| parent | cbe383ae832f13d5d2a20ee8fb5e85498205fbc3 (diff) | |
| parent | c962c6afb3b30eb6d42c2a5548898b3713492169 (diff) | |
| download | pleroma-942093683a1e6b3f3d3692268b2af8390da6d325.tar.gz pleroma-942093683a1e6b3f3d3692268b2af8390da6d325.zip | |
Merge branch 'develop' into feature/admin-api-status-count-per-instance
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" |