Merge branch 'no-php' of https://github.com/M2Ys4U/KiwiIRC into reorg
authorDarren <darren@darrenwhitlen.com>
Sun, 2 Oct 2011 21:12:25 +0000 (22:12 +0100)
committerDarren <darren@darrenwhitlen.com>
Sun, 2 Oct 2011 21:12:25 +0000 (22:12 +0100)
1  2 
client/css/default.css
client/css/ui.css
client/index.html.jade
client/js/front.events.js
client/js/front.js
client/js/util.js
server/app.js

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc server/app.js
Simple merge