]> jfr.im git - solanum.git/commitdiff
projects / solanum.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 67b7840 a5471f2)
Merge branch 'master+sharedsqlite' of https://github.com/lstarnes1024/charybdis
authorJilles Tjoelker <redacted>
Tue, 3 Jun 2014 20:40:32 +0000 (22:40 +0200)
committerJilles Tjoelker <redacted>
Tue, 3 Jun 2014 20:40:32 +0000 (22:40 +0200)

Trivial merge
Fork of solanum ircd, history is rebased regularly