Merge remote-tracking branch 'remotes/origin/develop' into automatic-authentication...
authorIvan Tashkinov <ivantashkinov@gmail.com>
Tue, 28 Apr 2020 16:56:20 +0000 (19:56 +0300)
committerIvan Tashkinov <ivantashkinov@gmail.com>
Tue, 28 Apr 2020 16:56:20 +0000 (19:56 +0300)
commit908cf22a6cb07044eb0fb44c9673c8adcf22c0db
treeb522172092989cb1d1312f846974ff55493fbee9
parentb4139cc5472079a34f0256ac9991a0222844d44c
parent699fc9569fa06278baaec6804348375cb9891185
Merge remote-tracking branch 'remotes/origin/develop' into automatic-authentication-and-instance-publicity-checks

# Conflicts:
# lib/pleroma/web/mastodon_api/controllers/account_controller.ex
lib/pleroma/web/mastodon_api/controllers/account_controller.ex
lib/pleroma/web/mastodon_api/controllers/status_controller.ex
lib/pleroma/web/mastodon_api/controllers/timeline_controller.ex