Merge remote-tracking branch 'remotes/upstream/develop' into 1260-rate-limited-auth...
authorIvan Tashkinov <ivantashkinov@gmail.com>
Mon, 7 Oct 2019 08:06:30 +0000 (11:06 +0300)
committerIvan Tashkinov <ivantashkinov@gmail.com>
Mon, 7 Oct 2019 08:06:30 +0000 (11:06 +0300)
commit28fb98d69e31ce5a09e15e213491b880430a0902
tree2910113e8a4ed4d225a4ffc8b6b95d56e782367f
parentf459aabdfafa990b33610438650f882ccac072d2
parentb4f3c16885a489c40de82e5ef321caafa4b10c81
Merge remote-tracking branch 'remotes/upstream/develop' into 1260-rate-limited-auth-actions

# Conflicts:
# CHANGELOG.md
CHANGELOG.md
lib/pleroma/web/oauth/oauth_controller.ex