From: Haelwenn <contact+git.pleroma.social@hacktivis.me>
Date: Fri, 14 Feb 2020 17:58:26 +0000 (+0000)
Subject: Merge branch 'update/ferd/recon' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=5fcee577f9713d9432115f8e3b51c3de2aef6fd0;p=akkoma

Merge branch 'update/ferd/recon' into 'develop'

Update ferd/recon

See merge request pleroma/pleroma!2211
---

5fcee577f9713d9432115f8e3b51c3de2aef6fd0