Merge branch 'develop' into 'develop'

added hyper:// to default protocols

See merge request pleroma/pleroma!2727
This commit is contained in:
lain 2020-07-07 11:41:56 +00:00
commit 4b53499bdc
2 changed files with 2 additions and 0 deletions

View file

@ -97,6 +97,7 @@ config :pleroma, :uri_schemes,
"dat",
"dweb",
"gopher",
"hyper",
"ipfs",
"ipns",
"irc",

View file

@ -498,6 +498,7 @@ config :pleroma, :config_description, [
"dat",
"dweb",
"gopher",
"hyper",
"ipfs",
"ipns",
"irc",