Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into chat-federation-information

2020-07-06 11:27:06 +02:00 · 2020-07-06 11:27:06 +02:00 · 74b88c0a8b
commit 74b88c0a8b
parent ef4c16f6f1 69f0b286f7
20 changed files with 107 additions and 23 deletions
--- a/test/web/mastodon_api/views/status_view_test.exs
+++ b/test/web/mastodon_api/views/status_view_test.exs
@ -183,6 +183,7 @@ defmodule Pleroma.Web.MastodonAPI.StatusViewTest do
      card: nil,
      reblog: nil,
      content: HTML.filter_tags(object_data["content"]),
+      text: nil,
      created_at: created_at,
      reblogs_count: 0,
      replies_count: 0,