[#1260] Merge remote-tracking branch 'remotes/upstream/develop' into 1260-rate-limite...
authorIvan Tashkinov <ivantashkinov@gmail.com>
Mon, 30 Sep 2019 14:41:20 +0000 (17:41 +0300)
committerIvan Tashkinov <ivantashkinov@gmail.com>
Mon, 30 Sep 2019 14:41:20 +0000 (17:41 +0300)
commit6ffa2b5f661c2db424334c6fb5de6f4d1bfeb745
treedd1b2129f3eb7df7b0141cc65ba6c492a36863d0
parentc98e761d28812818971d327800f1fc4c2baa2dbc
parenta22a7437d84065192601f73da73d2c27111c9b15
[#1260] Merge remote-tracking branch 'remotes/upstream/develop' into 1260-rate-limited-auth-actions

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