aboutsummaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorrinpatch <rinpatch@sdf.org>2020-04-08 15:51:56 +0000
committerrinpatch <rinpatch@sdf.org>2020-04-08 15:51:56 +0000
commit3b15a0eecc62f79465620a697f12b576ed87b0fc (patch)
treecbfc275ab8b5093a1dafacbbd830c7e6f1a19886 /config
parentbb49d8f5a0dbbad65a8f65a28cc2d0847b518067 (diff)
parentd9f36965f6412e476f723b4cf0278d8fd76d325c (diff)
downloadpleroma-3b15a0eecc62f79465620a697f12b576ed87b0fc.tar.gz
Merge branch 'release/2.0.2' into 'stable'v2.0.2
2.0.2 Release See merge request pleroma/pleroma!2336
Diffstat (limited to 'config')
-rw-r--r--config/description.exs2
1 files changed, 1 insertions, 1 deletions
diff --git a/config/description.exs b/config/description.exs
index c0e403b2e..5a1e9e9af 100644
--- a/config/description.exs
+++ b/config/description.exs
@@ -2461,7 +2461,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}]]
},
%{