projects / KiwiIRC.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2ca340b 31a18fa)
Merge branch 'proxy_ranges' into development
authorDarren <darren@darrenwhitlen.com>
Thu, 8 Nov 2012 21:15:03 +0000 (21:15 +0000)
committerDarren <darren@darrenwhitlen.com>
Thu, 8 Nov 2012 21:15:03 +0000 (21:15 +0000)
1  2 
config.js patch | diff1 | diff2 | blob | history

diff --cc config.js
Simple merge