Merge branch 'timestamp' of https://github.com/M2Ys4U/KiwiIRC into M2Ys4U-timestamp
authorDarren <darren@darrenwhitlen.com>
Sun, 2 Mar 2014 12:22:02 +0000 (12:22 +0000)
committerDarren <darren@darrenwhitlen.com>
Sun, 2 Mar 2014 12:22:02 +0000 (12:22 +0000)
commite9c86682c2a3554c99975bd4221c2cdefe69c049
treef47243ca7972d59beb774838e818d3eb7c3c3f72
parent0db58ad73e3e6051b6d462b099ecb52e0b8528bc
parent62d1e896d9db7be0b62daad7ab2b24feefd852ea
Merge branch 'timestamp' of https://github.com/M2Ys4U/KiwiIRC into M2Ys4U-timestamp

Conflicts:
client/src/views/channel.js
client/assets/themes/relaxed/style.css
client/src/index.html.tmpl
client/src/views/channel.js