Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
authorlain <lain@soykaf.club>
Tue, 21 Apr 2020 12:24:27 +0000 (14:24 +0200)
committerlain <lain@soykaf.club>
Tue, 21 Apr 2020 12:24:27 +0000 (14:24 +0200)
commita185b5455fc1ddf0d91c983c66c2161f9ade8867
treeb60ac3ce65ef9306413b972998017c172927f08a
parent5165287ff49ff894d2c318fd1138b789a97f9cce
parent3c828016d9d1ecb1ebcebb00aaadec2ace37f807
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms