Merge branch 'feature/locked-accounts-part-1' into 'develop'
authorlambda <pleromagit@rogerbraun.net>
Tue, 12 Jun 2018 07:18:19 +0000 (07:18 +0000)
committerlambda <pleromagit@rogerbraun.net>
Tue, 12 Jun 2018 07:18:19 +0000 (07:18 +0000)
locked accounts

See merge request pleroma/pleroma!180


Trivial merge