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 7a70164f3c2b0d7cb4d047d4db8c4d6a8d4531ed..d16cdf43f890b47f5c4c6c8e16eaacb173551b33 100644
(file)
--- a/
config/config.exs
+++ b/
config/config.exs
@@
-222,6
+222,7
@@
config :pleroma, :instance,
],
mrf_transparency: true,
mrf_transparency_exclusions: [],
],
mrf_transparency: true,
mrf_transparency_exclusions: [],
+ staff_transparency: [],
autofollowed_nicknames: [],
max_pinned_statuses: 1,
attachment_links: false,
autofollowed_nicknames: [],
max_pinned_statuses: 1,
attachment_links: false,
@@
-387,7
+388,6
@@
config :pleroma, :rich_media,
ignore_tld: ["local", "localdomain", "lan"],
parsers: [
Pleroma.Web.RichMedia.Parsers.TwitterCard,
ignore_tld: ["local", "localdomain", "lan"],
parsers: [
Pleroma.Web.RichMedia.Parsers.TwitterCard,
- Pleroma.Web.RichMedia.Parsers.OGP,
Pleroma.Web.RichMedia.Parsers.OEmbed
],
ttl_setters: [Pleroma.Web.RichMedia.Parser.TTL.AwsSignedUrl]
Pleroma.Web.RichMedia.Parsers.OEmbed
],
ttl_setters: [Pleroma.Web.RichMedia.Parser.TTL.AwsSignedUrl]