Merge branch 'remake-remodel-dms' of git.pleroma.social:pleroma/pleroma into remake...
authorlain <lain@soykaf.club>
Thu, 4 Jun 2020 17:24:07 +0000 (19:24 +0200)
committerlain <lain@soykaf.club>
Thu, 4 Jun 2020 17:24:07 +0000 (19:24 +0200)
commit74edd4f39174c2d0445772acc5c284b1575414f9
tree9cc2bb9cea41a292da1fabb4661da692b47c22a7
parent56dfa0e0fb0ca34054930e64e092f4a3a1b87fd1
parent9a53f619e03cd515460a7b1570d339e4554e1740
Merge branch 'remake-remodel-dms' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms