Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into chat-federation...
authorlain <lain@soykaf.club>
Mon, 6 Jul 2020 09:27:06 +0000 (11:27 +0200)
committerlain <lain@soykaf.club>
Mon, 6 Jul 2020 09:27:06 +0000 (11:27 +0200)
commit74b88c0a8bb12c3d534c826d6d1547bc40fff634
tree7764900ac5be30ccc40e6d18e5fe9989c880721c
parentef4c16f6f19c0544ed22972c78195547b4cf3f5d
parent69f0b286f7b3e0518ac7ae54dfb06539dc179698
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into chat-federation-information
CHANGELOG.md