Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into a1batross/pleroma...
authorlain <lain@soykaf.club>
Tue, 3 Nov 2020 12:45:09 +0000 (13:45 +0100)
committerlain <lain@soykaf.club>
Tue, 3 Nov 2020 12:45:09 +0000 (13:45 +0100)
commit91f6c3243032d88a813e4cfed6bf3d0f1ae5924d
tree3561c80c9efdc6164550a14fe557dfd7485b772a
parent1042c30fa53e838f3acae2c176f47997fa425755
parent0d8cc0905aeebb965df0cf755a171d21b01ed978
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into a1batross/pleroma-patch-4
CHANGELOG.md