projects / akkoma / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4c5ee4c ba17518)
Merge branch 'develop' of git.pleroma.social:cascode/pleroma into fix/user-search...
authorcascode <cascode@amplifie.red>
Sat, 5 Jan 2019 04:32:55 +0000 (20:32 -0800)
committercascode <cascode@amplifie.red>
Sat, 5 Jan 2019 04:32:55 +0000 (20:32 -0800)

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