projects / akkoma / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: acac6e3 0d24ab0)
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
authorsadposter <hannah+pleroma@coffee-and-dreams.uk>
Sun, 1 Dec 2019 19:03:08 +0000 (19:03 +0000)
committersadposter <hannah+pleroma@coffee-and-dreams.uk>
Sun, 1 Dec 2019 19:03:08 +0000 (19:03 +0000)

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