Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
authorlain <lain@soykaf.club>
Tue, 28 Apr 2020 15:48:05 +0000 (17:48 +0200)
committerlain <lain@soykaf.club>
Tue, 28 Apr 2020 15:48:05 +0000 (17:48 +0200)
commit30ea6bb1674482ef6ddbfd8744f9bd878eae91e9
treeed9f2490f2b960ff1aca1e91c84e74cb4cf2e79c
parentdedffd100c231aa69d7a7f7cd7126b90a84fc1ec
parent699fc9569fa06278baaec6804348375cb9891185
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms