vcs.fsf.org Git - KiwiIRC.git/commit

author	Darren <darren@darrenwhitlen.com>
	Fri, 19 Dec 2014 00:51:24 +0000 (00:51 +0000)
committer	Darren <darren@darrenwhitlen.com>
	Fri, 19 Dec 2014 00:51:24 +0000 (00:51 +0000)
commit	ca59759a962a603b8b71eddc442bf92226cda4a4
tree	3f0d9efc6dca3b781a78e9c4f7e50cf8563c68f6	tree \| snapshot (zip tar.gz)
parent	13e9c1907a5541bd14fcc9fe5cd559db19e4ce95	commit \| diff
parent	aecfa39d924ab9d296c8b3d2feab1c20c0b7af35	commit \| diff

Merge branch 'code-style-fixes' of https://github.com/spadgos/KiwiIRC into spadgos-code-style-fixes

Conflicts:
client/src/applets/settings.js