diff options
| author | kaniini <nenolod@gmail.com> | 2018-08-16 15:41:16 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2018-08-16 15:41:16 +0000 |
| commit | 183ccd18127c657e957f40de43ca309434b2180b (patch) | |
| tree | 9be5f0c898307f01d25c7e347c4afd79aec7be23 /config/config.exs | |
| parent | c004b6ea0a172b3c2a27c40a114d7a67f6d63a9c (diff) | |
| parent | d5091c3175786e5bcb0449f26cafe1795fd5f5d9 (diff) | |
| download | pleroma-183ccd18127c657e957f40de43ca309434b2180b.tar.gz pleroma-183ccd18127c657e957f40de43ca309434b2180b.zip | |
Merge branch 'dev-lanodan-url-regex' into 'develop'
lib/pleroma/formatter.ex: Fix URL regex
Closes #127
See merge request pleroma/pleroma!69
Diffstat (limited to 'config/config.exs')
| -rw-r--r-- | config/config.exs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/config/config.exs b/config/config.exs index ee30969e8..839e6bde6 100644 --- a/config/config.exs +++ b/config/config.exs @@ -16,6 +16,8 @@ config :pleroma, Pleroma.Upload, config :pleroma, :emoji, shortcode_globs: ["/emoji/custom/**/*.png"] +config :pleroma, :uri_schemes, additionnal_schemes: [] + # Configures the endpoint config :pleroma, Pleroma.Web.Endpoint, url: [host: "localhost"], |