projects / KiwiIRC.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 15907b9 9b60955)
Merge branch 'message_events' into development
authorDarren <darren@darrenwhitlen.com>
Sun, 1 Jun 2014 11:20:28 +0000 (12:20 +0100)
committerDarren <darren@darrenwhitlen.com>
Sun, 1 Jun 2014 11:20:28 +0000 (12:20 +0100)
* message_events:
  EventComponent comments
  Triggering message:type events
  privmsg/action/notice events combined into a 'message' event

1  2 
client/src/app.js patch | diff1 | diff2 | blob | history

diff --cc client/src/app.js
Simple merge