Merge branch 'add-deactivated-to-account-view' into 'develop'
authorkaniini <ariadne@dereferenced.org>
Tue, 16 Jul 2019 11:14:46 +0000 (11:14 +0000)
committerkaniini <ariadne@dereferenced.org>
Tue, 16 Jul 2019 11:14:46 +0000 (11:14 +0000)
commitd3b922276138cf7aaa896d52a8e35113a40e22dc
treeed02c143d7298736e821a507acd01d3931249a3f
parenta0d71d3ccfeece9deab213a627720dfc2aaf51be
parent520ee6c59162c26caf032b2d16ca975c99b5beb5
Merge branch 'add-deactivated-to-account-view' into 'develop'

Add `pleroma.deactivated` to the Account entity (Mastodon API)

See merge request pleroma/pleroma!1433