projects / akkoma / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d28f72a 1204aaa)
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into issue/2261
authorMark Felder <feld@FreeBSD.org>
Wed, 28 Oct 2020 13:48:26 +0000 (08:48 -0500)
committerMark Felder <feld@FreeBSD.org>
Wed, 28 Oct 2020 13:48:26 +0000 (08:48 -0500)

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