Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags...

# Conflicts:
#	test/pleroma/web/mastodon_api/views/status_view_test.exs

diff --cc CHANGELOG.md
Simple merge

diff --cc lib/pleroma/web/mastodon_api/views/status_view.ex
Simple merge

diff --cc test/pleroma/web/mastodon_api/views/status_view_test.exs
index eb84cc173662a3eb9a94e437d0a153c9bf71153a,ed59cf285652cab805ea999b225c8d672cc26975..48f5f0dd0cda5eb7d62643b7a329948dbd9acd27
--- 1/test/pleroma/web/mastodon_api/views/status_view_test.exs
--- 2/test/pleroma/web/mastodon_api/views/status_view_test.exs
+++ b/test/pleroma/web/mastodon_api/views/status_view_test.exs
@@@ -262,8 -262,8 +262,8 @@@ defmodule Pleroma.Web.MastodonAPI.Statu
        mentions: [],
        tags: [
          %{
 -          name: "#{object_data["tag"]}",
 -          url: "http://localhost:4001/tag/#{object_data["tag"]}"
 +          name: "#{hd(object_data["tag"])}",
-           url: "/tag/#{hd(object_data["tag"])}"
++          url: "http://localhost:4001/tag/#{hd(object_data["tag"])}"
          }
        ],
        application: %{