diff options
| author | kaniini <nenolod@gmail.com> | 2019-04-27 07:44:24 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2019-04-27 07:44:24 +0000 |
| commit | 002ea343f8c6dc9669bce91942f835a2c7cc6ae7 (patch) | |
| tree | 2886d3742bdec921839bfca4e4b76b60925c3ed0 /config | |
| parent | 81bc274930ea4e78224a475da03847caa94ecbea (diff) | |
| parent | ef52aa0e6647d00f5ff984d655ef4b27ab3e6b1a (diff) | |
| download | pleroma-002ea343f8c6dc9669bce91942f835a2c7cc6ae7.tar.gz pleroma-002ea343f8c6dc9669bce91942f835a2c7cc6ae7.zip | |
Merge branch 'feature/bbcode' into 'develop'
BBCode support (backend)
See merge request pleroma/pleroma!1097
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/config/config.exs b/config/config.exs index a1cca06f8..1a9738cff 100644 --- a/config/config.exs +++ b/config/config.exs @@ -221,7 +221,8 @@ config :pleroma, :instance, allowed_post_formats: [ "text/plain", "text/html", - "text/markdown" + "text/markdown", + "text/bbcode" ], mrf_transparency: true, autofollowed_nicknames: [], |