ccd0 673f9f89b5 Merge branch '1.8.8.x' into 1.8.9.x ...

Conflicts:
	CHANGELOG.md
	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

2014-08-12 07:07:03 -07:00

..

archives.json

update archive list (Nyafuu is back, rm /v/ from deniableplausibility)

2014-08-12 06:57:34 -07:00

Redirect.coffee

allow all archives to be disabled, take two

2014-08-09 15:23:10 -07:00