Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into embedded-object...
authorlain <lain@soykaf.club>
Mon, 27 Jul 2020 14:19:45 +0000 (16:19 +0200)
committerlain <lain@soykaf.club>
Mon, 27 Jul 2020 14:19:45 +0000 (16:19 +0200)
commit762c9ea5641ad67f0e664ad584f5cc1a5ed84857
treecce827b6485732f7c1183588698dde01405e0d64
parent1dd6de03ee655f5247ac62fee488307c934d7378
parent2a3abfd326f0cbb588dfe66a23e9783be3038a5e
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into embedded-object-federation