projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
[akkoma]
/
config
/
config.exs
diff --git
a/config/config.exs
b/config/config.exs
index c0b6ac1d66fe03ab2ba6c180f217d22949846d23..5739095f0f85e16a60fe745ee9a9e2abd2822bfb 100644
(file)
--- a/
config/config.exs
+++ b/
config/config.exs
@@
-233,6
+233,9
@@
config :pleroma, :instance,
"text/markdown",
"text/bbcode"
],
+ mrf_transparency: true,
+ mrf_transparency_exclusions: [],
+ staff_transparency: [],
autofollowed_nicknames: [],
autofollowing_nicknames: [],
max_pinned_statuses: 1,