]> jfr.im git - irc/quakenet/qwebirc.git/commit
Merge.
authorChris Porter <redacted>
Mon, 25 Aug 2014 22:19:08 +0000 (23:19 +0100)
committerChris Porter <redacted>
Mon, 25 Aug 2014 22:19:08 +0000 (23:19 +0100)
commit74ee64b3cdc820cf306a832ff38cb2cfaef97b33
tree016f96a215eb05f57d9bcee63361cde4ecd87223
parentf99ecfbd5e5de00dc5770d708d6f38bd5ac34a7c
parentffb5ea9ad7a184f56e82963b05bb3a256337dfee
Merge.
bin/pagegen.py
js/irc/ircclient.js
js/jslib.js
js/ui/baseui.js
js/ui/panes/options.js