Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
authorlain <lain@soykaf.club>
Mon, 18 May 2020 16:38:32 +0000 (18:38 +0200)
committerlain <lain@soykaf.club>
Mon, 18 May 2020 16:38:32 +0000 (18:38 +0200)
commit0d417e005d5ef89f982866ee09559aef24e36a85
tree1381e8f6dbe63ab3a0f61562672a3cf2d69d7f65
parentbaf051a59e8bfcb2e55b5e28e46e80d6961b9bb4
parent8e9c939e42b7d649d58ce91465086751031b13c8
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms