Merge branch 'fix/reserve-media-username' into 'develop'

Reserve /media See merge request pleroma/pleroma!620
2019-01-02 16:23:46 +00:00 · 2019-01-02 16:23:46 +00:00 · d1983ed028
commit d1983ed028
parent 32bed66471 5142b50f39
1 changed files with 2 additions and 1 deletions
--- a/config/config.exs
+++ b/config/config.exs
@ -249,7 +249,8 @@ config :pleroma, Pleroma.User,
    "auth",
    "proxy",
    "dev",
-    "internal"
+    "internal",
+    "media"
  ]

 config :pleroma, Pleroma.Web.Federator, max_jobs: 50