Zixaphir 1debf61f2e Merge branch 'v3' ...

Conflicts:
	CHANGELOG.md
	LICENSE
	builds/4chan-X.js
	builds/4chan-X.meta.js
	builds/4chan-X.user.js
	builds/crx/manifest.json
	builds/crx/script.js
	latest.js
	package.json
	src/General/Header.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/html/Settings/Advanced.html
	src/Monitoring/Favicon.coffee
	src/Monitoring/ThreadWatcher.coffee

2013-05-14 11:40:38 -07:00

..

QuoteBacklink.coffee

Backlinks

2013-05-10 05:58:27 -07:00

QuoteCT.coffee

Merge Mayhem's structure

2013-04-26 14:04:12 -07:00

QuoteInline.coffee

Merge branch 'v3' into Av2

2013-05-06 16:54:39 -07:00

QuoteOP.coffee

Merge Mayhem's structure

2013-04-26 14:04:12 -07:00

QuotePreview.coffee

Catch up to Mayhem, without archive changes

2013-05-09 19:33:33 -07:00

QuoteStrikeThrough.coffee

Merge Mayhem's structure

2013-04-26 14:04:12 -07:00

QuoteThreading.coffee

Merge Mayhem's structure

2013-04-26 14:04:12 -07:00

QuoteYou.coffee

Merge branch 'v3'

2013-05-10 04:58:26 -07:00

Quotify.coffee

Add @MayhemYDG's archive redirection

2013-05-12 09:00:00 -07:00