X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=config%2Fconfig.exs;h=5db0ea9aa9a5397834fa53514c7b73fb71392724;hb=6c8d15da110e86f799052c82df8b7b2404f8f722;hp=8b42a53513626b0ee58d9c31e9375d29cafc728d;hpb=25a659d2dcd093939aa2cba049902ea54ab89312;p=akkoma diff --git a/config/config.exs b/config/config.exs index 8b42a5351..5db0ea9aa 100644 --- a/config/config.exs +++ b/config/config.exs @@ -115,7 +115,7 @@ config :logger, :console, config :logger, :ex_syslogger, level: :debug, ident: "Pleroma", - format: "$date $time $metadata[$level] $message", + format: "$metadata[$level] $message", metadata: [:request_id] config :mime, :types, %{ @@ -238,6 +238,11 @@ config :pleroma, :mrf_simple, reject: [], accept: [] +config :pleroma, :mrf_keyword, + reject: [], + federated_timeline_removal: [], + replace: [] + config :pleroma, :rich_media, enabled: true config :pleroma, :media_proxy,