]> jfr.im git - erebus.git/commitdiff
projects / erebus.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3b25088 d9c49ad)
Merge branch 'master' of github.com:zonidjan/erebus
authorzonidjan <redacted>
Wed, 5 Feb 2014 21:11:12 +0000 (15:11 -0600)
committerzonidjan <redacted>
Wed, 5 Feb 2014 21:11:12 +0000 (15:11 -0600)
Conflicts:
LICENSE


Trivial merge
Erebus: modular IRC bot