pleroma

commit: d1983ed0282f1ae485f73024f25ec2753901fa8a
parent: 32bed664714c616d4a75579b450e52dcff5d8134
Author: rinpatch <rinpatch@sdf.org>
Date:   Wed,  2 Jan 2019 16:23:46 +0000

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

Reserve /media

See merge request pleroma/pleroma!620
Diffstat:
M
config/config.exs
3
++-

1 file changed, 2 insertions(+), 1 deletion(-)
diff --git 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