Zixaphir ea47aefd93 Merge branch 'v3' ...

Conflicts:
	.gitignore
	CHANGELOG.md
	CONTRIBUTING.md
	LICENSE
	builds/appchan-x.user.js
	builds/crx/manifest.json
	builds/crx/script.js
	latest.js
	package.json
	src/General/Header.coffee
	src/General/Index.coffee
	src/General/Settings.coffee
	src/General/UI.coffee
	src/General/html/Settings/Settings.html
	src/Images/Gallery.coffee
	src/Images/ImageExpand.coffee
	src/Monitoring/ThreadWatcher.coffee

2014-04-11 00:29:52 -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 'ccd0' into v3

2014-04-10 23:08:43 -07:00

script.js

Merge branch 'v3'

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