Merge branch 'feature/mastodon-s2s-block-opt-out' into 'develop'
authorlambda <pleromagit@rogerbraun.net>
Sat, 26 May 2018 09:50:54 +0000 (09:50 +0000)
committerlambda <pleromagit@rogerbraun.net>
Sat, 26 May 2018 09:50:54 +0000 (09:50 +0000)
activitypub: allow mastodon S2S block extension support to be disabled

See merge request pleroma/pleroma!176


Trivial merge