Merge branch 'develop' into 'develop'

added hyper:// to default protocols See merge request pleroma/pleroma!2727
2020-07-07 11:41:56 +00:00 · 2020-07-07 11:41:56 +00:00 · 4b53499bdc
commit 4b53499bdc
parent 9ad305209a a784c09db8
2 changed files with 2 additions and 0 deletions
--- a/config/config.exs
+++ b/config/config.exs
@ -97,6 +97,7 @@
    "dat",
    "dweb",
    "gopher",
+    "hyper",
    "ipfs",
    "ipns",
    "irc",
--- a/config/description.exs
+++ b/config/description.exs
@ -498,6 +498,7 @@
          "dat",
          "dweb",
          "gopher",
+          "hyper",
          "ipfs",
          "ipns",
          "irc",