summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorAlexander Strizhakov <alex.strizhakov@gmail.com>2020-03-30 12:15:23 +0300
committerAlexander Strizhakov <alex.strizhakov@gmail.com>2020-03-30 12:15:23 +0300
commitf497cf2f7c21196c4d633ddf0d14f0a4ede00cea (patch)
tree6ef3981f250af6c67619e9d48176c131328b76aa /config
parent7f9b5284fa7dd1d9100de730a6fe0c93739d1b30 (diff)
parente999c67cee65cfe07de6dc76ad18f213c0252bb3 (diff)
downloadpleroma-f497cf2f7c21196c4d633ddf0d14f0a4ede00cea.tar.gz
pleroma-f497cf2f7c21196c4d633ddf0d14f0a4ede00cea.zip
Merge branch 'develop' into gun
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 056f5971d..642f1a3ce 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}]]
},
%{