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)
commita6e0c31518ff60bd5e147941446779d719afaeb2
tree2423dd88f39ecc8349203102b3b403d7e6614305
parent01240fd8b6654f74aa7273fa624e927870629fa0
parent98104712379f4d001fc633eed7cfab69224816bc
Merge branch 'feature/locked-accounts-part-1' into 'develop'

locked accounts

See merge request pleroma/pleroma!180