Merge branch '1813-throttling' into 'develop'
authorrinpatch <rinpatch@sdf.org>
Tue, 26 May 2020 15:55:09 +0000 (15:55 +0000)
committerrinpatch <rinpatch@sdf.org>
Tue, 26 May 2020 15:55:09 +0000 (15:55 +0000)
commited08da9135e230ec67636a31f452c7ec31b9e79f
tree7012db687328d8cc8c8fa3c5267daad41e8a13cf
parent5083558ecd78a47647dbbde29b115792e0d43177
parent51bc6674f6a9b6794ba981052a1e432915beaef7
Merge branch '1813-throttling' into 'develop'

Mastodon API Controllers: Use the correct params for rate limiting.

Closes #1813

See merge request pleroma/pleroma!2586