From: lambda <pleromagit@rogerbraun.net>
Date: Sat, 26 May 2018 09:50:54 +0000 (+0000)
Subject: Merge branch 'feature/mastodon-s2s-block-opt-out' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=e1fe46e1cfccb7971032ecfa04426413f0c00ac6;p=akkoma

Merge branch 'feature/mastodon-s2s-block-opt-out' into 'develop'

activitypub: allow mastodon S2S block extension support to be disabled

See merge request pleroma/pleroma!176
---

e1fe46e1cfccb7971032ecfa04426413f0c00ac6