Merge branch 'develop' into gun

This commit is contained in:
Alexander Strizhakov 2020-03-01 12:48:49 +03:00
commit d9e4b77f8b
No known key found for this signature in database
GPG key ID: 022896A53AEF1381
1298 changed files with 3836 additions and 1862 deletions

View file

@ -578,6 +578,7 @@ config :http_signatures,
config :pleroma, :rate_limit,
authentication: {60_000, 15},
timeline: {500, 3},
search: [{1000, 10}, {1000, 30}],
app_account_creation: {1_800_000, 25},
relations_actions: {10_000, 10},