4 Commits

Author SHA1 Message Date
Zixaphir
599eaef3df Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3
Conflicts:
	Gruntfile.js
	src/features.coffee
	src/main.coffee
2013-04-16 18:03:14 -07:00
Zixaphir
991eb1f9cf Add an example to Custom Navigation. 2013-04-16 11:09:16 -07:00
Zixaphir
f66240b860 Merge some appchan x flavor. 2013-04-16 10:42:43 -07:00
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