Merge branch 'feature/1631-redesign-mrf-configuration' into 'develop'

Moving mrf settings from instance to separate mrf group

Closes #1631

See merge request pleroma/pleroma!2320

diff --cc CHANGELOG.md
index ffd43642a63ebfd4e32a0599779f737254b8fba3,fab87b56906c7b60897d6b146aae757e6cb0a953..7fc2231d147bb36f9a3d3df36fcbb996600f1cfa
--- 1/CHANGELOG.md
--- 2/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -6,11 -6,10 +6,13 @@@ The format is based on [Keep a Changelo
  ## [unreleased]
  
  ### Changed
 +- **Breaking:** Elixir >=1.9 is now required (was >= 1.8)
 +- In Conversations, return only direct messages as `last_status`
 +- Using the `only_media` filter on timelines will now exclude reblog media
  - MFR policy to set global expiration for all local Create activities
  - OGP rich media parser merged with TwitterCard
+ - Configuration: `:instance, rewrite_policy` moved to `:mrf, policies`, `:instance, :mrf_transparency` moved to `:mrf, :transparency`, `:instance, :mrf_transparency_exclusions` moved to `:mrf, :transparency_exclusions`. Old config namespace is deprecated.
+ 
  <details>
    <summary>API Changes</summary>
  - **Breaking:** Emoji API: changed methods and renamed routes.

diff --cc config/config.exs
Simple merge

diff --cc config/description.exs
Simple merge

diff --cc docs/configuration/cheatsheet.md
Simple merge

diff --cc lib/pleroma/config/config_db.ex
Simple merge

diff --cc lib/pleroma/web/mastodon_api/views/instance_view.ex
Simple merge

diff --cc test/tasks/config_test.exs
Simple merge