Merge remote-tracking branch 'upstream/develop' into linkify

diff --cc CHANGELOG.md
index 4d3bda99ea06a91f027b23be411997e896c5213e,a02f28241b202c394a79dd7d83b2a4b8534b7b7d..b124b59e1bfeb1bf96c3bfbbe422e25c8b692dad
--- 1/CHANGELOG.md
--- 2/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -7,6 -7,6 +7,7 @@@ The format is based on [Keep a Changelo
  
  ### Changed
  - **Breaking:** Elixir >=1.9 is now required (was >= 1.8)
++- **Breaking:** Configuration: `:auto_linker, :opts` moved to `:pleroma, Pleroma.Formatter`. Old config namespace is deprecated.
  - 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

diff --cc config/config.exs
Simple merge

diff --cc config/description.exs
index 204de8324f8db5476382e4a33aef5befa75979fb,f1c6773f1962b224fe336ce20ae0c7436d50410d..a936b7abfef2f6a919b24098c5c52ecce024bb84
--- 1/config/description.exs
--- 2/config/description.exs
+++ b/config/description.exs
@@@ -2157,11 -2216,11 +2216,12 @@@ config :pleroma, :config_description, 
      ]
    },
    %{
 -    group: :auto_linker,
 -    key: :opts,
 +    group: :pleroma,
 +    key: Pleroma.Formatter,
+     label: "Auto Linker",
      type: :group,
 -    description: "Configuration for the auto_linker library",
 +    description:
 +      "Configuration for Pleroma's link formatter which parses mentions, hashtags, and URLs.",
      children: [
        %{
          key: :class,

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

diff --cc mix.exs
Simple merge

diff --cc mix.lock
Simple merge