Merge branch 'develop' into 'docs/add-clients-to-ex_doc'

# Conflicts:
#   mix.exs

diff --cc mix.exs
index eba3295ddc3160ac652ee34b77cdb54297de9d74,ed6ca61354d8ca9909b2f2344e5125100a07a825..ee1c00bb9ee8b7fc887ce74d36861218a8cf8ae3
--- 1/mix.exs
--- 2/mix.exs
+++ b/mix.exs
@@@ -21,7 -21,13 +21,14 @@@ defmodule Pleroma.Mixfile d
        homepage_url: "https://pleroma.social/",
        docs: [
          logo: "priv/static/static/logo.png",
-         extras: ["README.md", "docs/Admin-API.md", "docs/Clients.md", "docs/config.md", "docs/Pleroma-API.md"],
+         extras: [
+           "README.md",
+           "docs/config.md",
+           "docs/Pleroma-API.md",
+           "docs/Admin-API.md",
++          "docs/Clients.md",
+           "docs/Differences-in-MastodonAPI-Responses.md"
+         ],
          main: "readme",
          output: "priv/static/doc"
        ]