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	Update Copyrights	2020-03-03 16:44:49 -06:00
remote_follow_controller.ex	[#1560] Restricted AP- & OStatus-related routes for non-federating instances.	2020-02-22 19:48:41 +03:00
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