projects / akkoma / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ee35bb5 6783d54)
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
authorlain <lain@soykaf.club>
Mon, 25 May 2020 14:52:03 +0000 (16:52 +0200)
committerlain <lain@soykaf.club>
Mon, 25 May 2020 14:52:03 +0000 (16:52 +0200)

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