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

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