From: Roger Braun <roger@rogerbraun.net>
Date: Sun, 11 Feb 2018 08:50:55 +0000 (+0100)
Subject: Merge branch 'develop' into feature/activitypub
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=52200998c997576c9008cbe50b0a7b9f0e6134cc;p=akkoma

Merge branch 'develop' into feature/activitypub
---

52200998c997576c9008cbe50b0a7b9f0e6134cc
diff --cc lib/pleroma/web/web_finger/web_finger.ex
index 11b36d6ac,95e717b17..09957e133
--- a/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