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)
commit117e005409c75c2d53df88fa19211823bdf3d61e
tree73a4ef5e0215fa3c10779adddc517911d270e0ba
parent3a77336d8999bed45518420c9f8b47d89dcf1f4d
parent51eaece3ea68226f1780e37e46f25e74f3392782
Merge branch 'security/fix-local-locked-accounts' into 'develop'

security: fix local locked accounts

Closes #316

See merge request pleroma/pleroma!372