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

..

crx

Merge branch 'v3'

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

4chan-X.meta.js

Release 4chan X v1.7.7.

2014-04-10 08:59:12 -07:00

appchan-x.meta.js

Release appchan x v2.9.15.

2014-04-05 05:40:46 -07:00

appchan-x.user.js

Merge branch 'v3'

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

appchan-x.zip

Release appchan x v2.9.15.

2014-04-05 05:40:46 -07:00

crx.crx

Release 4chan X v1.7.7.

2014-04-10 08:59:12 -07:00

updates.xml

Release 4chan X v1.7.7.

2014-04-10 08:59:12 -07:00