Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
authorlain <lain@soykaf.club>
Mon, 21 May 2018 10:09:33 +0000 (12:09 +0200)
committerlain <lain@soykaf.club>
Mon, 21 May 2018 10:09:33 +0000 (12:09 +0200)
commit39bf535221fde2d19ebc2178359d2b8272ed4fa4
tree96c21db896504c3541e858e9e3cfdcae9cf9e054
parentbf64208b524482e44407840b7aa66dd896c05def
parent961f1312571843209487cc1caa9355fa6552d965
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop