Merge remote-tracking branch 'upstream/develop' into chat-moderation
authorAlex Gleason <alex@alexgleason.me>
Fri, 11 Sep 2020 19:13:38 +0000 (14:13 -0500)
committerAlex Gleason <alex@alexgleason.me>
Fri, 11 Sep 2020 19:13:38 +0000 (14:13 -0500)
commit9733c9d06563a92e4c58ac906c5f98b617b9e731
treeabbf03ddb917c1c203cb79eab64647d3af541fff
parentdfb831ca39db3098d6d585448a6ff8e938e51e8c
parent9fb88c814ddadd9138ef29550a856938491a1ca4
Merge remote-tracking branch 'upstream/develop' into chat-moderation
lib/pleroma/chat.ex
lib/pleroma/web/common_api/common_api.ex
lib/pleroma/web/mastodon_api/views/status_view.ex
test/support/factory.ex
test/web/admin_api/controllers/admin_api_controller_test.exs
test/web/common_api/common_api_test.exs