From: lambda <pleromagit@rogerbraun.net>
Date: Sun, 17 Feb 2019 17:39:45 +0000 (+0000)
Subject: Merge branch 'develop' into 'docs/add-clients-to-ex_doc'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=a2f4fc49fe6d12fb9fc442b63f2ddd63e3e44782;p=akkoma

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

# Conflicts:
#   mix.exs
---

a2f4fc49fe6d12fb9fc442b63f2ddd63e3e44782
diff --cc mix.exs
index eba3295dd,ed6ca6135..ee1c00bb9
--- a/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"
        ]