projects / akkoma / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5165287 3c82801)
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)

Trivial merge
Fork of https://akkoma.dev/AkkomaGang/akkoma.git