projects / akkoma / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c43f414 6b5032e)
resolved merge conflict
authorKaren Konou <konoukaren@gmail.com>
Thu, 7 Feb 2019 22:47:13 +0000 (23:47 +0100)
committerKaren Konou <konoukaren@gmail.com>
Thu, 7 Feb 2019 22:47:13 +0000 (23:47 +0100)

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