Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
authorlain <lain@soykaf.club>
Tue, 2 Jun 2020 08:43:13 +0000 (10:43 +0200)
committerlain <lain@soykaf.club>
Tue, 2 Jun 2020 08:43:13 +0000 (10:43 +0200)
commit8e1db6a8352754fd70c51ab8527b71180aa15a5b
treeea12ca93e5d22e407440d75bb70fce2ac6e140ab
parentaf9090238e1f71e6b081fbd09c09a5975d2ed99e
parent6fb900a496e1797c1a3b438db9f96b09d9546f1d
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms