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

diff --cc CHANGELOG.md
index 974925e4fa060a7205fb116c99232803a3ca7316,812816f48c205142cc35b6c3dd4417580fe58962..35f68d2fe25134c54b77379a043c012ac410b784
--- 1/CHANGELOG.md
--- 2/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -37,9 -37,9 +37,10 @@@ The format is based on [Keep a Changelo
  - **Breaking:** AdminAPI `GET /api/pleroma/admin/instances/:instance/statuses` changed response format and added the number of total users posts.
  - Admin API: Reports now ordered by newest
  - Pleroma API: `GET /api/v1/pleroma/chats` is deprecated in favor of `GET /api/v2/pleroma/chats`.
+ - Pleroma API: Reroute `/api/pleroma/*` to `/api/v1/pleroma/*`
  
  </details>
 +- Improved hashtag timeline performance (requires a background migration). 
  
  ### Added
  

diff --cc docs/configuration/cheatsheet.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 48f5f0dd0cda5eb7d62643b7a329948dbd9acd27,2de3afc4fb15f59dfb3f2b58ba584409fd09f678..4172cc2945ecb280720f3d06f30763ba99f8190e
--- 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,14 -262,11 +262,11 @@@ 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: "http://localhost:4001/tag/#{hd(object_data["tag"])}"
          }
        ],
-       application: %{
-         name: "Web",
-         website: nil
-       },
+       application: nil,
        language: nil,
        emojis: [
          %{