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

@ -74,11 +74,7 @@ config :pleroma, Pleroma.ScheduledActivity,
total_user_limit: 3,
enabled: false
config :pleroma, :rate_limit,
search: [{1000, 30}, {1000, 30}],
app_account_creation: {10_000, 5},
password_reset: {1000, 30},
ap_routes: nil
config :pleroma, :rate_limit, %{}
config :pleroma, :http_security, report_uri: "https://endpoint.com"