Merge remote-tracking branch 'remotes/origin/develop' into clear-config-test-improvements
authorIvan Tashkinov <ivantashkinov@gmail.com>
Fri, 20 Mar 2020 15:08:23 +0000 (18:08 +0300)
committerIvan Tashkinov <ivantashkinov@gmail.com>
Fri, 20 Mar 2020 15:08:23 +0000 (18:08 +0300)
commit0e27c274f4f68f3385753a2482d881bae7c35a06
tree9193330053ce995462c9c735e9c43467d7a9b50e
parentec3719f5391d6f9945cec2e36287049d72743cd4
parent5efa5b0c4a08c2bf73d6926ee7c418e31a04195c
Merge remote-tracking branch 'remotes/origin/develop' into clear-config-test-improvements

# Conflicts:
# test/web/mastodon_api/controllers/account_controller_test.exs
test/web/mastodon_api/controllers/account_controller_test.exs
test/web/mastodon_api/controllers/status_controller_test.exs