Merge branch 'promise' of https://github.com/M2Ys4U/KiwiIRC into M2Ys4U-promise
authorDarren <darren@darrenwhitlen.com>
Fri, 17 Oct 2014 23:47:32 +0000 (00:47 +0100)
committerDarren <darren@darrenwhitlen.com>
Fri, 17 Oct 2014 23:47:32 +0000 (00:47 +0100)
commitfeafc63fbe3f7b1380a925fc79907b3191fb87bd
treee23476898982119c87f74b9f7835bff5c900259b
parentfc066e9304814671c794f09b69103d5f99b74f2d
parent81f42bda5586360e733f3afc66cf8a82bbeb94e1
Merge branch 'promise' of https://github.com/M2Ys4U/KiwiIRC into M2Ys4U-promise

Conflicts:
package.json
client/assets/plugins/textstyle.html
client/src/app.js
client/src/index.html.tmpl
client/src/models/network.js
package.json
server/httphandler.js
server/irc/connection.js
server/irc/state.js
server/settingsgenerator.js