projects / akkoma / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a999e8b e6dab65)
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 2236-no-name
authorlain <lain@soykaf.club>
Mon, 26 Oct 2020 15:30:48 +0000 (16:30 +0100)
committerlain <lain@soykaf.club>
Mon, 26 Oct 2020 15:30:48 +0000 (16:30 +0100)

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