]> jfr.im git - irc/quakenet/qwebirc.git/commitdiff
Merge.
authorChris Porter <redacted>
Mon, 18 Aug 2014 18:53:22 +0000 (19:53 +0100)
committerChris Porter <redacted>
Mon, 18 Aug 2014 18:53:22 +0000 (19:53 +0100)
1  2 
bin/pagegen.py
js/ui/panes/options.js

diff --cc bin/pagegen.py
Simple merge
Simple merge