diff options
| author | kaniini <nenolod@gmail.com> | 2018-10-25 18:24:07 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2018-10-25 18:24:07 +0000 |
| commit | 9fe9c098831fa2071bbe68024d135736208addb5 (patch) | |
| tree | 4e5a39a0ea442c56ac990368806e6aa52f996871 /config | |
| parent | 63556150e1226baceb4ae152376243f6bf691249 (diff) | |
| parent | ae5beb7b6464d9bc4532693987d9d94cd5bac6bd (diff) | |
| download | pleroma-9fe9c098831fa2071bbe68024d135736208addb5.tar.gz pleroma-9fe9c098831fa2071bbe68024d135736208addb5.zip | |
Merge branch 'finmoji-optional' into 'develop'
Make finmoji optional
See merge request pleroma/pleroma!391
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/config/config.exs b/config/config.exs index 225ca914a..2d2cdda45 100644 --- a/config/config.exs +++ b/config/config.exs @@ -96,6 +96,7 @@ config :pleroma, :instance, "text/html", "text/markdown" ], + finmoji_enabled: true, mrf_transparency: true config :pleroma, :markup, |