diff options
author | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2020-02-14 17:58:26 +0000 |
---|---|---|
committer | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2020-02-14 17:58:26 +0000 |
commit | 5fcee577f9713d9432115f8e3b51c3de2aef6fd0 (patch) | |
tree | ac738f1253823c5867d2aa5cfc3255866cc2fa6a /rel | |
parent | 9906c6fb6fb0e2ebb36fa91fae94828bcc02ef27 (diff) | |
parent | 0b19fcdda1b45ee814328309f8e13d33a87fbbda (diff) | |
download | pleroma-5fcee577f9713d9432115f8e3b51c3de2aef6fd0.tar.gz |
Merge branch 'update/ferd/recon' into 'develop'
Update ferd/recon
See merge request pleroma/pleroma!2211
Diffstat (limited to 'rel')
0 files changed, 0 insertions, 0 deletions