Ivan Tashkinov 0062116e07 Merge remote-tracking branch 'remotes/origin/develop' into automatic-authentication-and-instance-publicity-checks ...

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

2020-04-22 18:51:59 +03:00

..

password_controller.ex

…

remote_follow_controller.ex

…

util_controller.ex

Merge remote-tracking branch 'remotes/origin/develop' into automatic-authentication-and-instance-publicity-checks

2020-04-22 18:51:59 +03:00