Zixaphir 21a0bba285 Merge branch 'v3' into Av2 ...

Conflicts:
	Gruntfile.coffee
	builds/4chan-X.js
	builds/4chan-X.meta.js
	builds/4chan-X.user.js
	builds/appchan-x.js
	builds/crx.crx
	builds/crx/manifest.json
	builds/crx/script.js
	package.json
	src/code/main.coffee
	src/code/posting/qr.coffee
	src/css/burichan.css
	src/css/futaba.css
	src/css/photon.css
	src/css/style.css
	src/css/tomorrow.css
	src/css/yotsuba-b.css
	src/css/yotsuba.css
	src/features.coffee
	src/img/favicons/Original/unreadDead.gif
	src/img/favicons/Original/unreadNSFW.gif
	src/img/favicons/Original/unreadSFW.gif
	src/img/favicons/dead.gif
	src/img/favicons/empty.gif
	src/img/favicons/ferongr/unreadDead.gif
	src/img/favicons/ferongr/unreadNSFW.gif
	src/img/favicons/ferongr/unreadSFW.gif

2013-04-16 21:02:47 -07:00

..

crx

Merge branch 'v3' into Av2

2013-04-16 21:02:47 -07:00

appchan-x.js

Merge branch 'v3' into Av2

2013-04-16 21:02:47 -07:00

appchan-x.meta.js

Merge branch 'v3' into Av2

2013-04-16 21:02:47 -07:00

appchan-x.user.js

Merge branch 'v3' into Av2

2013-04-16 21:02:47 -07:00

appchan-x.zip

I don't care for toggles. A dismissed announcement is dismissed.

2013-04-16 17:41:36 -07:00

crx.crx

Merge branch 'v3' into Av2

2013-04-16 21:02:47 -07:00