Merge remote-tracking branch 'remotes/origin/develop' into ostatus-controller-no...
authorIvan Tashkinov <ivantashkinov@gmail.com>
Wed, 28 Oct 2020 16:03:40 +0000 (19:03 +0300)
committerIvan Tashkinov <ivantashkinov@gmail.com>
Wed, 28 Oct 2020 16:03:40 +0000 (19:03 +0300)
commitba50dc05a8d655deece0aa619aebe1e25dc9d4eb
tree4fd9c8ccc64de7b7ab1be6dd0659d34a6daa87d9
parentd54233760f4c006d89aa80e0ae78cb6910fc74ab
parent342c2e1bc0055b71a9772ef031eab3e8bc88d29b
Merge remote-tracking branch 'remotes/origin/develop' into ostatus-controller-no-auth-check-on-non-federating-instances

# Conflicts:
# CHANGELOG.md
CHANGELOG.md
test/support/conn_case.ex