projects / akkoma / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5f4fc0c 11e010f)
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
authorsadposter <hannah+pleroma@coffee-and-dreams.uk>
Fri, 27 Dec 2019 18:44:13 +0000 (18:44 +0000)
committersadposter <hannah+pleroma@coffee-and-dreams.uk>
Fri, 27 Dec 2019 18:44:13 +0000 (18:44 +0000)

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