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

..

banner.js

Merge branch 'v3'

2013-08-18 11:17:07 -07:00

botproc.js

Merge Zixaphir X

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

manifest.json

Damn typos.

2014-04-04 16:27:37 -07:00

metadata.js

Merge branch 'v3'

2014-04-04 16:01:06 -07:00

updates.xml

fix updates.xml

2014-04-03 16:29:35 -07:00

usestrict.js

Merge Zixaphir X

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