ccd0 53ad72ee9a Merge branch 'Stable' into Beta ...

Conflicts:
	LICENSE
	builds/4chan-X-beta.crx
	builds/4chan-X-beta.meta.js
	builds/4chan-X-beta.user.js
	builds/4chan-X-noupdate.crx
	builds/4chan-X-noupdate.user.js
	builds/4chan-X.crx
	builds/4chan-X.meta.js
	builds/4chan-X.user.js
	builds/4chan-X.zip
	builds/updates-beta.xml
	builds/updates.xml
	package.json
	src/Quotelinks/Quotify.coffee

2015-01-04 10:42:27 -08:00

..

Archive

Merge remote-tracking branch 'archives/master' into Stable

2014-12-17 18:50:52 -08:00

Filtering

Support Anonymize on internal archive.

2015-01-04 10:15:05 -08:00

General

Merge branch 'Stable' into Beta

2015-01-04 10:42:27 -08:00

Images

Support archived thread list page.

2015-01-04 09:47:03 -08:00

Linkification

Support archived thread list page.

2015-01-04 09:47:03 -08:00

Menu

Support archived thread list page.

2015-01-04 09:47:03 -08:00

Miscellaneous

Merge branch 'Stable' into Beta

2015-01-04 10:42:27 -08:00

Monitoring

Fix some errors from features run on 404 pages.

2015-01-03 14:27:59 -08:00

Posting

Revert "Temporarily hard-enable captcha on /b/."

2015-01-04 00:09:26 -08:00

Quotelinks

Merge branch 'Stable' into Beta

2015-01-04 10:42:27 -08:00