Merge branch 'development' of https://github.com/CoryChaplin/KiwiIRC into text_themes
authorCory Chaplin <cory.chaplin@laposte.net>
Fri, 4 Apr 2014 07:56:15 +0000 (09:56 +0200)
committerCory Chaplin <cory.chaplin@laposte.net>
Fri, 4 Apr 2014 07:56:15 +0000 (09:56 +0200)
commit4bb4a041eb09c0f663061ca24928b698721b600b
treed995bf341ae1b2872a1e24970f27f4db200a8362
parent2bb0a45b1c90fa47954b5d06efa5b47d31f962ae
parente537d683091b2b0a670a83accc99ac91ff7cf4b6
Merge branch 'development' of https://github.com/CoryChaplin/KiwiIRC into text_themes

Conflicts:
client/src/app.js
client/src/models/member.js
client/src/app.js
client/src/models/member.js
client/src/models/network.js