Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
authorlain <lain@soykaf.club>
Fri, 15 May 2020 11:33:04 +0000 (13:33 +0200)
committerlain <lain@soykaf.club>
Fri, 15 May 2020 11:33:04 +0000 (13:33 +0200)
commitf012c3a202ef43d1a8a1dc88f08057b7a41d3d78
treea3847182efa357bce56c12d6253492dc0cc2b894
parent1d18721a3c60aa0acc7d1ba858a92277e544a54a
parent081d1d3f48f2264ee329f7ff7af7c2f88fe0a654
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms