Zixaphir d11b435134 Merge branch 'v3' ...

Conflicts:
	CHANGELOG.md
	LICENSE
	README.md
	builds/appchan-x.user.js
	builds/crx/icon16.png
	builds/crx/icon48.png
	builds/crx/manifest.json
	builds/crx/script.js
	latest.js
	package.json
	src/General/Config.coffee
	src/General/html/Features/QuickReply.html
	src/General/img/icon16.png
	src/General/img/icon48.png
	src/Miscellaneous/Emoji.coffee
	src/Posting/QR.captcha.coffee
	src/Posting/QR.coffee

2014-02-16 02:17:36 -07:00

..

Build

Fixes for post building

2013-12-25 11:30:56 -07:00

Features

Merge branch 'v3'

2014-02-16 02:17:36 -07:00

Monitoring

Merge branch 'json' into ajson

2014-01-11 15:55:46 -07:00

Settings

Merge branch 'v3'

2014-02-16 02:17:36 -07:00