Merge branch 'remake-remodel-dms' of git.pleroma.social:pleroma/pleroma into remake...
authorlain <lain@soykaf.club>
Tue, 9 Jun 2020 07:21:44 +0000 (09:21 +0200)
committerlain <lain@soykaf.club>
Tue, 9 Jun 2020 07:21:44 +0000 (09:21 +0200)
commit40d5058cc4d8b235fa1ea7842c511f08df346c61
treef8d1996ea2b5a2d6c3d43c7185d4d6d149b85f91
parente1bc37d11852684a5007a9550208944d899800ca
parentfc04a138d46c43860a2838d60fc8668112fdc1ec
Merge branch 'remake-remodel-dms' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms