Zixaphir 478a75d03e Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3
Conflicts:
	css/style.css
	src/config.coffee
	src/qr.coffee
2013-04-13 23:20:09 -07:00
..
2013-03-19 09:52:19 -07:00