diff options
| author | lain <lain@soykaf.club> | 2020-07-07 11:41:56 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2020-07-07 11:41:56 +0000 |
| commit | 4b53499bdcd8df59c30c0326eebfe30a7a13161e (patch) | |
| tree | a3bb635f99366c4ae9f4774fa9713a8250cd4408 | |
| parent | 9ad305209aabd8619a397060f979c1f4e735def3 (diff) | |
| parent | a784c09db861c097557fe62f7e451fcd457c9740 (diff) | |
| download | pleroma-4b53499bdcd8df59c30c0326eebfe30a7a13161e.tar.gz pleroma-4b53499bdcd8df59c30c0326eebfe30a7a13161e.zip | |
Merge branch 'develop' into 'develop'
added hyper:// to default protocols
See merge request pleroma/pleroma!2727
| -rw-r--r-- | config/config.exs | 1 | ||||
| -rw-r--r-- | config/description.exs | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/config/config.exs b/config/config.exs index d28a359b2..6c2707f26 100644 --- a/config/config.exs +++ b/config/config.exs @@ -97,6 +97,7 @@ config :pleroma, :uri_schemes, "dat", "dweb", "gopher", + "hyper", "ipfs", "ipns", "irc", diff --git a/config/description.exs b/config/description.exs index 370af80a6..650610fbe 100644 --- a/config/description.exs +++ b/config/description.exs @@ -498,6 +498,7 @@ config :pleroma, :config_description, [ "dat", "dweb", "gopher", + "hyper", "ipfs", "ipns", "irc", |