Merge branch 'chore/changelog-update' into 'develop'
authorkaniini <ariadne@dereferenced.org>
Wed, 31 Jul 2019 20:08:27 +0000 (20:08 +0000)
committerkaniini <ariadne@dereferenced.org>
Wed, 31 Jul 2019 20:08:27 +0000 (20:08 +0000)
commitcdfd02e90455fe7c01026efb48af3194cc82252b
tree64b74419a43be028069e8c0a5ec7a1635e194233
parent6c06529cd4549fca3ba4b1de72838240463f8306
parentdef0c49ead94d21a63bdc7323521b6d73ad4c0b2
Merge branch 'chore/changelog-update' into 'develop'

Add a changelog entry for disallowing locked accounts follows over OStatus

See merge request pleroma/pleroma!1513