Zixaphir b662cf2366 Merge branch 'v3' ...

Conflicts:
	CHANGELOG.md
	Gruntfile.coffee
	LICENSE
	README.md
	builds/appchan-x.user.js
	builds/crx/manifest.json
	builds/crx/script.js
	latest.js
	package.json
	src/General/Config.coffee
	src/General/css/style.css
	src/Posting/QR.captcha.coffee
	src/Posting/QR.coffee

2014-04-03 15:19:41 -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 branch 'v3'

2013-08-15 23:02:54 -07:00

manifest.json

Merge branch 'v3'

2014-04-03 15:19:41 -07:00

script.js

Merge branch 'v3'

2014-04-03 15:19:41 -07:00