projects / akkoma / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d5e5e87 8c6d5a6)
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
authorSadposter <hannah+pleroma@coffee-and-dreams.uk>
Sun, 14 Apr 2019 18:00:50 +0000 (19:00 +0100)
committerSadposter <hannah+pleroma@coffee-and-dreams.uk>
Sun, 14 Apr 2019 18:00:50 +0000 (19:00 +0100)

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