Merge branch 'develop' into feature/activitypub

diff --cc config/config.exs
Simple merge

diff --cc lib/pleroma/user.ex
Simple merge

diff --cc lib/pleroma/web/router.ex
Simple merge

diff --cc lib/pleroma/web/web_finger/web_finger.ex
index 11b36d6acafe5768e02e3efbce6e89572fac2127,95e717b17859086c3e2dddb7a7561718161e8424..09957e13316da154353433b1d8433dd40f37277a
--- 1/lib/pleroma/web/web_finger/web_finger.ex
--- 2/lib/pleroma/web/web_finger/web_finger.ex
+++ b/lib/pleroma/web/web_finger/web_finger.ex
@@@ -45,7 -45,7 +45,8 @@@ defmodule Pleroma.Web.WebFinger d
          {:Link, %{rel: "http://webfinger.net/rel/profile-page", type: "text/html", href: user.ap_id}},
          {:Link, %{rel: "salmon", href: OStatus.salmon_path(user)}},
          {:Link, %{rel: "magic-public-key", href: "data:application/magic-public-key,#{magic_key}"}},
-         {:Link, %{rel: "self", type: "application/activity+json", href: user.ap_id}}
++        {:Link, %{rel: "self", type: "application/activity+json", href: user.ap_id}},
+         {:Link, %{rel: "http://ostatus.org/schema/1.0/subscribe", template: OStatus.remote_follow_path()}}
        ]
      }
      |> XmlBuilder.to_doc