Zixaphir 46478eb4d0 Merge branch 'duckness' into v3 ...

Conflicts:
	CHANGELOG.md
	LICENSE
	builds/4chan-X.user.js
	builds/crx/script.js
	src/Linkification/Linkify.coffee
	src/Posting/QR.captcha.coffee
	src/Posting/QR.coffee

2014-04-03 14:52:55 -07:00

..

icon16.png

Update .crx

2014-02-13 18:37:20 +01:00

icon48.png

Update .crx

2014-02-13 18:37:20 +01:00

icon128.png

Merge Zixaphir X

2013-08-12 00:07:39 -07:00

manifest.json

Merge branch 'master' of https://github.com/Spittie/4chan-x into v3

2014-03-01 14:53:36 -07:00

script.js

Merge branch 'duckness' into v3

2014-04-03 14:52:55 -07:00