projects / akkoma / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: baf051a 8e9c939)
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
authorlain <lain@soykaf.club>
Mon, 18 May 2020 16:38:32 +0000 (18:38 +0200)
committerlain <lain@soykaf.club>
Mon, 18 May 2020 16:38:32 +0000 (18:38 +0200)

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