From: Darren <darren@darrenwhitlen.com>
Date: Sun, 2 Mar 2014 12:22:02 +0000 (+0000)
Subject: Merge branch 'timestamp' of https://github.com/M2Ys4U/KiwiIRC into M2Ys4U-timestamp
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=e9c86682c2a3554c99975bd4221c2cdefe69c049;p=KiwiIRC.git

Merge branch 'timestamp' of https://github.com/M2Ys4U/KiwiIRC into M2Ys4U-timestamp

Conflicts:
	client/src/views/channel.js
---

e9c86682c2a3554c99975bd4221c2cdefe69c049
diff --cc client/src/views/channel.js
index 28498de,df9d315..ced59fc
--- a/client/src/views/channel.js
+++ b/client/src/views/channel.js
@@@ -59,7 -59,7 +59,7 @@@ _kiwi.view.Channel = _kiwi.view.Panel.e
              time_difference,
              sb = this.model.get('scrollback'),
              prev_msg = sb[sb.length-2],
-             network;
 -            hour, pm;
++            network, hour, pm;
  
          // Nick highlight detecting
          if ((new RegExp('(^|\\W)(' + escapeRegex(_kiwi.app.connections.active_connection.get('nick')) + ')(\\W|$)', 'i')).test(msg.msg)) {