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)
commite1fe46e1cfccb7971032ecfa04426413f0c00ac6
tree7b8ed19a65cc2250a7f88ff36e7ee533e5c4907e
parent5d6d86bf00fa533d505ffe5fc3df6c3eadae5739
parent1c926c7b60b999311d01266bb65187e1be5adc1e
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