projects / KiwiIRC.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: eb49ba1 3efb4f3)
Merge pull request #310 from Felizardo/encoding2
authorDarren <darren@darrenwhitlen.com>
Mon, 1 Jul 2013 20:48:47 +0000 (13:48 -0700)
committerDarren <darren@darrenwhitlen.com>
Mon, 1 Jul 2013 20:48:47 +0000 (13:48 -0700)
Support for encodings other than UTF-8

1  2 
client/assets/src/models/application.js patch | diff1 | diff2 | blob | history
client/assets/src/models/gateway.js patch | diff1 | diff2 | blob | history
package.json patch | diff1 | diff2 | blob | history
server/irc/connection.js patch | diff1 | diff2 | blob | history

diff --cc client/assets/src/models/gateway.js
Simple merge
diff --cc package.json
Simple merge
diff --cc server/irc/connection.js
Simple merge