diff options
| author | lambda <pleromagit@rogerbraun.net> | 2019-02-17 17:39:45 +0000 |
|---|---|---|
| committer | lambda <pleromagit@rogerbraun.net> | 2019-02-17 17:39:45 +0000 |
| commit | a2f4fc49fe6d12fb9fc442b63f2ddd63e3e44782 (patch) | |
| tree | 6020b41080baf529496a5faf36e1523279a76511 /mix.exs | |
| parent | 25ab90edeaae53b6ce084d1ba9a02df5505b5041 (diff) | |
| parent | 79e503b3f5ea87c53d4c616ca9ddfa049877705c (diff) | |
| download | pleroma-a2f4fc49fe6d12fb9fc442b63f2ddd63e3e44782.tar.gz pleroma-a2f4fc49fe6d12fb9fc442b63f2ddd63e3e44782.zip | |
Merge branch 'develop' into 'docs/add-clients-to-ex_doc'
# Conflicts:
# mix.exs
Diffstat (limited to 'mix.exs')
| -rw-r--r-- | mix.exs | 9 |
1 files changed, 8 insertions, 1 deletions
@@ -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" ] |