Merge branch 'develop' into feature/expire-mutes
authorRoman Chvanikov <chvanikoff@pm.me>
Thu, 17 Sep 2020 11:54:00 +0000 (14:54 +0300)
committerRoman Chvanikov <chvanikoff@pm.me>
Thu, 17 Sep 2020 11:54:00 +0000 (14:54 +0300)
1  2 
config/config.exs
lib/pleroma/user.ex
test/user_test.exs
test/web/mastodon_api/views/account_view_test.exs

Simple merge
Simple merge
Simple merge