Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into pleroma-2.1-rc0
authorlain <lain@soykaf.club>
Fri, 28 Aug 2020 09:33:11 +0000 (11:33 +0200)
committerlain <lain@soykaf.club>
Fri, 28 Aug 2020 09:33:11 +0000 (11:33 +0200)
commit4e022fc16c921dba9299a101b9574c2215270227
tree2a881b520b96c12490555e8dc8ebce33048318ef
parent82bf27172c4aae19e22c8d976da547035ca7feb0
parent6b01a09a08e14c415ac3bd48ea28c742ee7a3dc8
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into pleroma-2.1-rc0
CHANGELOG.md