Merge branch 'config-changes' into 'develop'

two separate files for config.md and generated config.md

See merge request pleroma/pleroma!1666

(cherry picked from commit 9c64a25713790fefa8b5c419aeadf55113c17073)

69faec03 markdown generation to the new file
c625fe6f config.md back
4da0da9a don't track generated_config.md

1 files changed, 1 insertions, 2 deletions

diff --git a/mix.exs b/mix.exs
index 96ef723b2..dfa530358 100644
--- a/mix.exs
+++ b/mix.exs
@@ -172,8 +172,7 @@ defmodule Pleroma.Mixfile do
       "ecto.rollback": ["pleroma.ecto.rollback"],
       "ecto.setup": ["ecto.create", "ecto.migrate", "run priv/repo/seeds.exs"],
       "ecto.reset": ["ecto.drop", "ecto.setup"],
-      test: ["ecto.create --quiet", "ecto.migrate", "test"],
-      docs: ["pleroma.docs", "docs"]
+      test: ["ecto.create --quiet", "ecto.migrate", "test"]
     ]
   end