Merge branch 'development' of https://github.com/ehues/KiwiIRC into ehues-development
authorDarren <darren@darrenwhitlen.com>
Sun, 30 Nov 2014 03:17:58 +0000 (03:17 +0000)
committerDarren <darren@darrenwhitlen.com>
Sun, 30 Nov 2014 03:17:58 +0000 (03:17 +0000)
commitc93febfc339e9bd1e05e859434c87f5526179f66
treed4995074c872aba823e827c7d567003206eca2c0
parent0f74793bae57767f776c0619f01dfb1328cb08a0
parent63b21ebe140af72fe9145123904836b3f3891e79
Merge branch 'development' of https://github.com/ehues/KiwiIRC into ehues-development

Conflicts:
client/src/views/application.js
client/assets/themes/basic/style.css
client/assets/themes/mini/style.css
client/assets/themes/relaxed/style.css
client/src/views/application.js
client/src/views/channel.js