Merge branch 'deactivated-in-user-view' into 'develop'
authorkaniini <nenolod@gmail.com>
Thu, 28 Feb 2019 10:08:31 +0000 (10:08 +0000)
committerkaniini <nenolod@gmail.com>
Thu, 28 Feb 2019 10:08:31 +0000 (10:08 +0000)
commit3c849d0438b9c8e2954c46455b8f37a3ee71c25c
tree8c717b935da48d9548187bd74d446d2be8a8759c
parent9cc98b496ee378a2d6459b080e1d0067ac216911
parent6b11011039dca5090c3a7b7b2a01f32b666be380
Merge branch 'deactivated-in-user-view' into 'develop'

Add activation status to the regular user view

See merge request pleroma/pleroma!874