diff options
| author | rinpatch <rinpatch@sdf.org> | 2019-01-02 16:23:46 +0000 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2019-01-02 16:23:46 +0000 |
| commit | d1983ed0282f1ae485f73024f25ec2753901fa8a (patch) | |
| tree | 6431d9bb666b6acc9eb694d371608002d7ec01de | |
| parent | 32bed664714c616d4a75579b450e52dcff5d8134 (diff) | |
| parent | 5142b50f39b91c7de1a1c06c5038e7d9984d97de (diff) | |
| download | pleroma-d1983ed0282f1ae485f73024f25ec2753901fa8a.tar.gz | |
Merge branch 'fix/reserve-media-username' into 'develop'
Reserve /media
See merge request pleroma/pleroma!620
| -rw-r--r-- | config/config.exs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/config/config.exs b/config/config.exs index d30b33197..d743406dc 100644 --- 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 |