vcs.fsf.org Git - KiwiIRC.git/commit - client/src/applets/settings.js

author	Darren <darren@darrenwhitlen.com>
	Thu, 16 Jan 2014 11:18:21 +0000 (11:18 +0000)
committer	Darren <darren@darrenwhitlen.com>
	Thu, 16 Jan 2014 11:18:21 +0000 (11:18 +0000)
commit	83dc56c57dfc1df0e10aa030f3bc261b336c5099
tree	8c8a5a1bdf91748661863c2de719fb27cf0bfdf0	tree \| snapshot (zip tar.gz)
parent	cff41bb956756fb0e7802093996369ac2101b9db	commit \| diff
parent	15dc5f90edb96b46467860c5214c2670722acc1d	commit \| diff

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

RSS Atom

client/assets/css/style.css	diff1 \|	diff2 \|	blob \| history
client/assets/themes/basic/style.css	\|	diff2 \|	blob \| history
client/assets/themes/cli/style.css	\|	diff2 \|	blob \| history
client/assets/themes/mini/style.css	\|	diff2 \|	blob \| history
client/assets/themes/relaxed/style.css	\|	diff2 \|	blob \| history
client/src/applets/settings.js	diff1 \|	diff2 \|	blob \| history
client/src/index.html.tmpl	diff1 \|	diff2 \|	blob \| history
client/src/models/application.js	diff1 \|	diff2 \|	blob \| history
client/src/views/application.js	diff1 \|	diff2 \|	blob \| history
config.example.js	diff1 \|	diff2 \|	blob \| history
server/httphandler.js	diff1 \|	diff2 \|	blob \| history