projects / KiwiIRC.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0410781 b2bb27e)
Merge branch 'development' of github.com:prawnsalad/KiwiIRC into development
authorDarren <darren@darrenwhitlen.com>
Mon, 6 Oct 2014 17:46:07 +0000 (18:46 +0100)
committerDarren <darren@darrenwhitlen.com>
Mon, 6 Oct 2014 17:46:07 +0000 (18:46 +0100)
# By Ramiro Bou (2) and Darren (1)
* 'development' of github.com:prawnsalad/KiwiIRC:
  Emoticons erroneous quote
  Fixing the CTCP PING
  Adding CTCP PING response


Trivial merge