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

# Conflicts:
#   docs/configuration/mrf.md

diff --cc docs/configuration/mrf.md
index d965bd53ed3b364cfe16c89143d1a334838251a7,9b2289e7c47af79e9772c20b4a11955c04c62748..c3957c2551fce3b2ccac8f4445eeeeff31270836
--- 1/docs/configuration/mrf.md
--- 2/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,