Merge remote-tracking branch 'remotes/origin/develop' into automatic-authentication...
authorIvan Tashkinov <ivantashkinov@gmail.com>
Wed, 22 Apr 2020 15:51:59 +0000 (18:51 +0300)
committerIvan Tashkinov <ivantashkinov@gmail.com>
Wed, 22 Apr 2020 15:51:59 +0000 (18:51 +0300)
commit0062116e07446beea13768d122e5bcb19c60dde7
tree2c050be2e440364824680fdff3c4499daf118dee
parent2958a7d246f40141a88bcb7bdd6a477c4f65f0bc
parent28f8fcf8b034223209ec451d0c2c836124ec93f4
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/twitter_api/controllers/util_controller.ex