Merge branch 'add-blocked-by-to-relationship' into 'develop'
authorkaniini <ariadne@dereferenced.org>
Tue, 16 Jul 2019 11:04:11 +0000 (11:04 +0000)
committerkaniini <ariadne@dereferenced.org>
Tue, 16 Jul 2019 11:04:11 +0000 (11:04 +0000)
commita0d71d3ccfeece9deab213a627720dfc2aaf51be
treeeb7ebeb22a75f2afc515f8d7687eb68fa79dd039
parentcf7ca1db0e10b61cc64c7cadc7cf70d57cbfe684
parentc4ca142e14444a03250f246e189c78e70aafe9d7
Merge branch 'add-blocked-by-to-relationship' into 'develop'

Add the `blocked_by` attribute to the relationship API (`GET /api/v1/accounts/relationships`)

See merge request pleroma/pleroma!1429