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

# Conflicts: # mix.exs
2019-02-17 17:39:45 +00:00 · 2019-02-17 17:39:45 +00:00 · a2f4fc49fe
commit a2f4fc49fe
parent 25ab90edea 79e503b3f5
60 changed files with 600 additions and 127 deletions
--- a/mix.exs
+++ b/mix.exs
@ -21,7 +21,14 @@ defmodule Pleroma.Mixfile do
      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"
      ]