Merge branch 'develop' into 'develop'

added hyper:// to default protocols See merge request pleroma/pleroma!2727
4 years ago · 4b53499bdc
--- a/config/config.exs
+++ b/config/config.exs
@@ -97,6 +97,7 @@ config :pleroma, :uri_schemes,
    "dat",
    "dweb",
    "gopher",
    "hyper",
    "ipfs",
    "ipns",
    "irc",
--- a/config/description.exs
+++ b/config/description.exs
@@ -498,6 +498,7 @@ config :pleroma, :config_description, [
          "dat",
          "dweb",
          "gopher",
          "hyper",
          "ipfs",
          "ipns",
          "irc",