diff options
| author | rinpatch <rinpatch@sdf.org> | 2020-03-25 18:00:24 +0000 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2020-03-25 18:00:24 +0000 |
| commit | de62e633d3c5c939ac2dd3099005f0ecce609f9f (patch) | |
| tree | 2a388bc9db4d67e9db9fdbf4a060aabbd3e75691 /config | |
| parent | d96139f78924c5607cd218ea5432a9b80a6301ea (diff) | |
| parent | 3fa3d45dbecafb06fb7eb4f0260f610d4225e0a7 (diff) | |
| download | pleroma-de62e633d3c5c939ac2dd3099005f0ecce609f9f.tar.gz pleroma-de62e633d3c5c939ac2dd3099005f0ecce609f9f.zip | |
Merge branch '1364-notifications-sending-control' into 'develop'
[#1364] Ability to opt-out of notifications (in all clients)
Closes #1364
See merge request pleroma/pleroma!2301
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 3781fb9cb..9612adba7 100644 --- a/config/description.exs +++ b/config/description.exs @@ -2442,7 +2442,7 @@ config :pleroma, :config_description, [ %{ key: :relations_actions, type: [:tuple, {:list, :tuple}], - description: "For actions on relations with all users (follow, unfollow)", + description: "For actions on relationships with all users (follow, unfollow)", suggestions: [{1000, 10}, [{10_000, 10}, {10_000, 50}]] }, %{ |