From: lambda <pleromagit@rogerbraun.net>
Date: Fri, 3 Nov 2017 08:56:44 +0000 (+0000)
Subject: Merge branch 'feature/blocks' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=fa1f11e8e9c31b0ed2857ca3c3feb78552ed54d0;p=akkoma

Merge branch 'feature/blocks' into 'develop'

Feature/blocks

See merge request pleroma/pleroma!5
---

fa1f11e8e9c31b0ed2857ca3c3feb78552ed54d0