From: lambda <pleromagit@rogerbraun.net>
Date: Tue, 12 Jun 2018 07:18:19 +0000 (+0000)
Subject: Merge branch 'feature/locked-accounts-part-1' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=a6e0c31518ff60bd5e147941446779d719afaeb2;p=akkoma

Merge branch 'feature/locked-accounts-part-1' into 'develop'

locked accounts

See merge request pleroma/pleroma!180
---

a6e0c31518ff60bd5e147941446779d719afaeb2