Merge remote-tracking branch 'remotes/origin/develop' into relations-preloading-for...
authorIvan Tashkinov <ivantashkinov@gmail.com>
Tue, 24 Mar 2020 19:15:37 +0000 (22:15 +0300)
committerIvan Tashkinov <ivantashkinov@gmail.com>
Tue, 24 Mar 2020 19:15:37 +0000 (22:15 +0300)
1  2 
lib/pleroma/user.ex
lib/pleroma/web/mastodon_api/views/account_view.ex

Simple merge