Merge branch 'security/fix-local-locked-accounts' into 'develop'
authorkaniini <nenolod@gmail.com>
Thu, 11 Oct 2018 10:56:12 +0000 (10:56 +0000)
committerkaniini <nenolod@gmail.com>
Thu, 11 Oct 2018 10:56:12 +0000 (10:56 +0000)
security: fix local locked accounts

Closes #316

See merge request pleroma/pleroma!372


Trivial merge