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)
commit44e8b6037ae71881327451dcf7d9351f1ba82674
treed78e161239f819c3310248f3d1685bc481f0504c
parentc5830ac037c0c344bd22b674c41f4dc244a088aa
parentc5acbf8a1bd1a14ea82610cb3f69b8ebbb3ea28b
Merge branch 'develop' into feature/expire-mutes
config/config.exs
lib/pleroma/user.ex
test/user_test.exs
test/web/mastodon_api/views/account_view_test.exs