Merge branch 'update/ferd/recon' into 'develop'
authorHaelwenn <contact+git.pleroma.social@hacktivis.me>
Fri, 14 Feb 2020 17:58:26 +0000 (17:58 +0000)
committerHaelwenn <contact+git.pleroma.social@hacktivis.me>
Fri, 14 Feb 2020 17:58:26 +0000 (17:58 +0000)
commit5fcee577f9713d9432115f8e3b51c3de2aef6fd0
treeac738f1253823c5867d2aa5cfc3255866cc2fa6a
parent9906c6fb6fb0e2ebb36fa91fae94828bcc02ef27
parent0b19fcdda1b45ee814328309f8e13d33a87fbbda
Merge branch 'update/ferd/recon' into 'develop'

Update ferd/recon

See merge request pleroma/pleroma!2211