X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=config%2Fconfig.exs;h=9e4ee8d02e1ecc576f649843195db6223362c0f8;hb=305d2194136d4560e02c110d528164034d3727b2;hp=0db940fdc84afe5d18d59121d14c7eba01672beb;hpb=5b1d7c3c5672af065af503891d156b6e0cf5a8c1;p=akkoma diff --git a/config/config.exs b/config/config.exs index 0db940fdc..9e4ee8d02 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,