Zixaphir 77433f5da8 Merge branch 'v3' into Av2 ...

Conflicts:
	builds/4chan-X.js
	builds/4chan-X.meta.js
	builds/4chan-X.user.js
	builds/crx.crx
	builds/crx/manifest.json
	builds/crx/script.js
	package.json
	src/General/Config.coffee
	src/General/Main.coffee
	src/General/Settings.coffee
	src/General/css/burichan.css
	src/General/css/futaba.css
	src/General/css/photon.css
	src/General/css/style.css
	src/General/css/tomorrow.css
	src/General/css/yotsuba-b.css
	src/General/css/yotsuba.css
	src/General/img/favicons/Original/unreadDead.gif
	src/General/img/favicons/Original/unreadNSFW.gif
	src/General/img/favicons/Original/unreadSFW.gif
	src/General/img/favicons/dead.gif
	src/General/img/favicons/empty.gif
	src/General/img/favicons/ferongr/unreadDead.gif
	src/General/img/favicons/ferongr/unreadNSFW.gif
	src/General/img/favicons/ferongr/unreadSFW.gif
	src/General/meta/metadata.js
	src/Miscellaneous/AnnouncementHiding.coffee
	src/Miscellaneous/Keybinds.coffee
	src/Monitoring/ThreadStats.coffee
	src/Monitoring/ThreadUpdater.coffee
	src/Posting/QuickReply.coffee
	src/features/misc/header.coffee
	src/features/monitoring/favicon.coffee

2013-04-28 21:20:22 -07:00

..

crx

Merge branch 'v3' into Av2

2013-04-28 21:20:22 -07:00

appchan-x.js

Merge branch 'v3' into Av2

2013-04-28 21:20:22 -07:00

appchan-x.meta.js

Merge branch 'v3' into Av2

2013-04-28 21:20:22 -07:00

appchan-x.user.js

Merge branch 'v3' into Av2

2013-04-28 21:20:22 -07:00

crx.crx

Fix custom navigation on /q/.

2013-04-24 15:02:36 -07:00