Merge branch 'themes' of https://github.com/M2Ys4U/KiwiIRC into M2Ys4U-themes
authorDarren <darren@darrenwhitlen.com>
Thu, 16 Jan 2014 11:18:21 +0000 (11:18 +0000)
committerDarren <darren@darrenwhitlen.com>
Thu, 16 Jan 2014 11:18:21 +0000 (11:18 +0000)
commit83dc56c57dfc1df0e10aa030f3bc261b336c5099
tree8c8a5a1bdf91748661863c2de719fb27cf0bfdf0
parentcff41bb956756fb0e7802093996369ac2101b9db
parent15dc5f90edb96b46467860c5214c2670722acc1d
Merge branch 'themes' of https://github.com/M2Ys4U/KiwiIRC into M2Ys4U-themes

Conflicts:
client/assets/css/style.css
client/src/applets/settings.js
client/src/index.html.tmpl
server/httphandler.js
client/assets/css/style.css
client/assets/themes/basic/style.css
client/assets/themes/cli/style.css
client/assets/themes/mini/style.css
client/assets/themes/relaxed/style.css
client/src/applets/settings.js
client/src/index.html.tmpl
client/src/models/application.js
client/src/views/application.js
config.example.js
server/httphandler.js