Zixaphir 0e103f0526 Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3
Conflicts:
	lib/$.coffee
	lib/ui.coffee
	src/config.coffee
	src/features.coffee
	src/main.coffee
	src/qr.coffee

Also added a proper Chrome build. I'mma have to save my pem file...
2013-04-15 23:11:22 -07:00
..
2013-03-19 09:52:19 -07:00