Merge branch 'develop' into feature/expire-mutes
authorRoman Chvanikov <chvanikoff@pm.me>
Sun, 20 Sep 2020 16:27:27 +0000 (19:27 +0300)
committerRoman Chvanikov <chvanikoff@pm.me>
Sun, 20 Sep 2020 16:27:27 +0000 (19:27 +0300)
commit4987ee6256c4227793240c74043845a661e3d37b
tree40abf0e0c85df9788b59f24ed4026ae00a89e5e5
parent44e8b6037ae71881327451dcf7d9351f1ba82674
parent882c1fc6bdff4e27955730a412d73ead0e67a741
Merge branch 'develop' into feature/expire-mutes
config/config.exs
lib/pleroma/user.ex
lib/pleroma/web/api_spec/operations/account_operation.ex
lib/pleroma/web/api_spec/operations/status_operation.ex
lib/pleroma/web/common_api/common_api.ex
test/web/common_api/common_api_test.exs
test/web/mastodon_api/views/account_view_test.exs