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

Reserve /media

See merge request pleroma/pleroma!620

diff --cc config/config.exs
index d30b3319798aba49c7088c1ec159a09d00d12ed7,47ed8d2603813c6b8163cef43960c7a4ac1efa82..d743406dc898c5b4b02e24197adc26b4e23190a5
--- 1/config/config.exs
--- 2/config/config.exs
+++ b/config/config.exs
@@@ -249,17 -249,10 +249,18 @@@ config :pleroma, Pleroma.User
      "auth",
      "proxy",
      "dev",
-     "internal"
+     "internal",
+     "media"
    ]
  
 +config :pleroma, Pleroma.Web.Federator, max_jobs: 50
 +
 +config :pleroma, Pleroma.Web.Federator.RetryQueue,
 +  enabled: false,
 +  max_jobs: 20,
 +  initial_timeout: 30,
 +  max_retries: 5
 +
  # Import environment specific config. This must remain at the bottom
  # of this file so it overrides the configuration defined above.
  import_config "#{Mix.env()}.exs"