Merge branch 'feature/remove-disable-blocks' into 'develop'
authorkaniini <ariadne@dereferenced.org>
Tue, 13 Aug 2019 02:45:47 +0000 (02:45 +0000)
committerkaniini <ariadne@dereferenced.org>
Tue, 13 Aug 2019 02:45:47 +0000 (02:45 +0000)
commit984d7be1a4b4d1e1024a9f5d5aaee6252c553279
tree837a101fb853c673caec14bfee51aaca82331dd6
parentb0fad153e1d4bf6c95c18bdab92a42978b729108
parentf46cd7e9c750b9c4c36f0a6c4b3a1ffd2f94a6d0
Merge branch 'feature/remove-disable-blocks' into 'develop'

config: remove legacy activitypub accept_blocks setting

See merge request pleroma/pleroma!1556