projects / KiwiIRC.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 806e20d 4bb4a04)
Merge branch 'text_themes' of https://github.com/CoryChaplin/KiwiIRC into CoryChaplin...
authorDarren <darren@darrenwhitlen.com>
Mon, 14 Apr 2014 08:49:35 +0000 (09:49 +0100)
committerDarren <darren@darrenwhitlen.com>
Mon, 14 Apr 2014 08:49:35 +0000 (09:49 +0100)
1  2 
client/src/app.js patch | diff1 | diff2 | blob | history
client/src/models/application.js patch | diff1 | diff2 | blob | history
client/src/views/channel.js patch | diff1 | diff2 | blob | history

diff --cc client/src/app.js
Simple merge
diff --cc client/src/models/application.js
Simple merge
diff --cc client/src/views/channel.js
Simple merge