From: kaniini <nenolod@gmail.com>
Date: Thu, 11 Oct 2018 10:56:12 +0000 (+0000)
Subject: Merge branch 'security/fix-local-locked-accounts' into 'develop'
X-Git-Url: http://git.squeep.com/?a=commitdiff_plain;h=117e005409c75c2d53df88fa19211823bdf3d61e;p=akkoma

Merge branch 'security/fix-local-locked-accounts' into 'develop'

security: fix local locked accounts

Closes #316

See merge request pleroma/pleroma!372
---

117e005409c75c2d53df88fa19211823bdf3d61e