hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'remotes/origin/develop' into restricted-relations-embedding

Browse source
This commit is contained in:
Ivan Tashkinov 2020-05-10 09:17:16 +03:00
commit b0d0d8f91b
27 changed files with 69 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

2
config/description.exs
View file

@ -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"