projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'follower-mrf-again' into 'develop'
[akkoma]
/
config
/
config.exs
diff --git
a/config/config.exs
b/config/config.exs
index 134dccf49c3c98bee7c98648fecd15a4d9d07674..6acb38051859306cc4e54755a1c01928f6421bd7 100644
(file)
--- a/
config/config.exs
+++ b/
config/config.exs
@@
-172,7
+172,7
@@
config :mime, :types, %{
"application/ld+json" => ["activity+json"]
}
"application/ld+json" => ["activity+json"]
}
-config :tesla, adapter: Tesla.Adapter.
Gun
+config :tesla, adapter: Tesla.Adapter.
Hackney
# Configures http settings, upstream proxy etc.
config :pleroma, :http,
# Configures http settings, upstream proxy etc.
config :pleroma, :http,
@@
-252,7
+252,8
@@
config :pleroma, :instance,
number: 5,
length: 16
]
number: 5,
length: 16
]
- ]
+ ],
+ show_reactions: true
config :pleroma, :welcome,
direct_message: [
config :pleroma, :welcome,
direct_message: [
@@
-373,6
+374,7
@@
config :pleroma, :mrf_simple,
federated_timeline_removal: [],
report_removal: [],
reject: [],
federated_timeline_removal: [],
report_removal: [],
reject: [],
+ followers_only: [],
accept: [],
avatar_removal: [],
banner_removal: [],
accept: [],
avatar_removal: [],
banner_removal: [],