Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-admin-api
authorlain <lain@soykaf.club>
Wed, 4 Nov 2020 12:23:18 +0000 (13:23 +0100)
committerlain <lain@soykaf.club>
Wed, 4 Nov 2020 12:23:18 +0000 (13:23 +0100)
commite46c95b826c3fb98efa15cf6fd5d6cf2fb9797af
tree5eac134f31a610d4a1a87003c3ac0728ded42bc0
parent6163fbf55328808d90bb1a84cf05ae986f941b31
parentba3f3a5a56d4a5ac05443fd30b5864778ad1131e
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-admin-api
CHANGELOG.md