Zixaphir 37a3b05e39 Merge branch 'ccd0' into v3 ...

Conflicts:
	CHANGELOG.md
	LICENSE
	builds/4chan-X.user.js
	builds/crx.crx
	builds/crx/script.js
	package.json
	src/Archive/archives.json
	src/General/Get.coffee
	src/General/Navigate.coffee
	src/Images/Gallery.coffee
	src/Linkification/Linkify.coffee
	src/Posting/QR.coffee
	src/Posting/QR.post.coffee

2014-05-11 16:04:14 -07:00

..

crx

Merge branch 'ccd0' into v3

2014-05-11 16:04:14 -07:00

4chan-X.meta.js

Release 4chan X v1.7.33.

2014-05-10 23:22:40 -07:00

4chan-X.user.js

Merge branch 'ccd0' into v3

2014-05-11 16:04:14 -07:00

crx.crx

Release 4chan X v1.7.33.

2014-05-10 23:22:40 -07:00

updates.xml

Release 4chan X v1.7.33.

2014-05-10 23:22:40 -07:00