From: lambda <pleromagit@rogerbraun.net>
Date: Mon, 11 Jun 2018 11:19:45 +0000 (+0000)
Subject: Merge branch 'feature/domain-blocks' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=7f79b467b1b56ce9ac7f544aaa2b687dcae341c5;p=akkoma

Merge branch 'feature/domain-blocks' into 'develop'

Domain blocks

See merge request pleroma/pleroma!190
---

7f79b467b1b56ce9ac7f544aaa2b687dcae341c5