Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into emoji-reaction...
authorlain <lain@soykaf.club>
Mon, 20 Jan 2020 17:10:55 +0000 (18:10 +0100)
committerlain <lain@soykaf.club>
Mon, 20 Jan 2020 17:10:55 +0000 (18:10 +0100)
commit7d8b709d293064462256d9a6392f993232323a4d
tree9565cc8b0eae80ed40cae526a124a3cfa9e2edec
parent4c5b5f14dcec51cba8e86bcfcf2943ee9b49b0e4
parentab36459464311389c2929ff1c48537889066a9f8
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into emoji-reaction-extensions
CHANGELOG.md