Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1808-pleroma-sucks
authorlain <lain@soykaf.club>
Mon, 25 May 2020 12:01:16 +0000 (14:01 +0200)
committerlain <lain@soykaf.club>
Mon, 25 May 2020 12:01:16 +0000 (14:01 +0200)
commitf20dff451e7abf343906b4e74f5d47b6207a3580
tree69278b3894508c546b2dd87b3443966dddb11364
parentaeb0875025cf37ad8cefe43c637f56a5a16f8628
parent6783d544b2d3856bda3f8f9136011923ee8b30fe
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1808-pleroma-sucks