projects / akkoma / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a7ec08d 228bf4d)
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
authorsadposter <hannah+pleroma@coffee-and-dreams.uk>
Wed, 4 Dec 2019 23:20:03 +0000 (23:20 +0000)
committersadposter <hannah+pleroma@coffee-and-dreams.uk>
Wed, 4 Dec 2019 23:20:03 +0000 (23:20 +0000)

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