From: lambda <pleromagit@rogerbraun.net>
Date: Mon, 25 Jun 2018 06:12:29 +0000 (+0000)
Subject: Merge branch 'feature/configurable-blocks' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=dfc96f222cc65eda92e5696a2fc2d6d926f960ed;p=akkoma

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

Add more configurability to how blocks work

See merge request pleroma/pleroma!203
---

dfc96f222cc65eda92e5696a2fc2d6d926f960ed