projects / KiwiIRC.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: de1607b 7b506f7)
Merge branch 'development'
authorDarren <darren@darrenwhitlen.com>
Mon, 26 Jan 2015 11:19:17 +0000 (11:19 +0000)
committerDarren <darren@darrenwhitlen.com>
Mon, 26 Jan 2015 11:19:17 +0000 (11:19 +0000)
Conflicts:
client/src/applets/startup.js


Trivial merge