Zixaphir 2efa358131 Merge branch 'v3' ...

Conflicts:
	CHANGELOG.md
	LICENSE
	builds/appchan-x.user.js
	builds/crx/manifest.json
	builds/crx/script.js
	package.json
	src/General/Navigate.coffee
	src/Miscellaneous/CatalogLinks.coffee
	src/Posting/QR.coffee

2014-05-27 12:39:01 -07:00

..

Build

apply Mayhem's quoting fix

2014-05-03 08:23:02 -07:00

Features

Merge branch 'v3'

2014-05-03 06:20:04 -07:00

Monitoring

Merge branch 'json' into ajson

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

Settings

Merge branch 'v3'

2014-04-11 00:29:52 -07:00