From: feld <feld@feld.me>
Date: Tue, 18 Feb 2020 20:58:15 +0000 (+0000)
Subject: Merge branch 'develop' into 'fix/mrf-sample-doc'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=53a7680c161d3bc7b046ec576e5269de668f547f;p=akkoma

Merge branch 'develop' into 'fix/mrf-sample-doc'

# Conflicts:
#   docs/configuration/mrf.md
---

53a7680c161d3bc7b046ec576e5269de668f547f
diff --cc docs/configuration/mrf.md
index d965bd53e,9b2289e7c..c3957c255
--- a/docs/configuration/mrf.md
+++ b/docs/configuration/mrf.md
@@@ -116,9 -111,9 +118,9 @@@ defmodule Pleroma.Web.ActivityPub.MRF.R
  end
  ```
  
 -If you save this file as `lib/site/mrf/rewrite_policy.ex`, it will be included when you next rebuild Pleroma. You can enable it in the configuration like so:
 +If you save this file as `lib/pleroma/web/activity_pub/mrf/rewrite_policy.ex`, it will be included when you next rebuild Pleroma.  You can enable it in the configuration like so:
  
- ```
+ ```elixir
  config :pleroma, :instance,
    rewrite_policy: [
      Pleroma.Web.ActivityPub.MRF.SimplePolicy,