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)
commit8f1d622b8dfaf6bf00d5f1bf6b988c12766b72ea
treed913b98c4a089fdf872716a861626d698cdb1e63
parent13cbb9f6ada8dcb15bb7ed12be4d88a18c5db7f7
parent8eebc75c152ee339bac347350266e3bc6536016b
Merge remote-tracking branch 'remotes/origin/develop' into relations-preloading-for-statuses-rendering
lib/pleroma/user.ex
lib/pleroma/web/mastodon_api/views/account_view.ex