Merge remote-tracking branch 'remotes/upstream/develop' into 1260-rate-limited-auth...
authorIvan Tashkinov <ivantashkinov@gmail.com>
Sun, 6 Oct 2019 06:30:49 +0000 (09:30 +0300)
committerIvan Tashkinov <ivantashkinov@gmail.com>
Sun, 6 Oct 2019 06:30:49 +0000 (09:30 +0300)
commitf459aabdfafa990b33610438650f882ccac072d2
treee5bfcb4f8fc7c2dd06e08f90b3a841c4f9ad759a
parent6ffa2b5f661c2db424334c6fb5de6f4d1bfeb745
parent9e34919dcdbeedf8eb623dc86b05f63ef44d8859
Merge remote-tracking branch 'remotes/upstream/develop' into 1260-rate-limited-auth-actions

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