projects / akkoma / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d6dbcc0 d1e8910)
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
authorsadposter <hannah+pleroma@coffee-and-dreams.uk>
Thu, 25 Jul 2019 11:00:29 +0000 (12:00 +0100)
committersadposter <hannah+pleroma@coffee-and-dreams.uk>
Thu, 25 Jul 2019 11:00:29 +0000 (12:00 +0100)

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