Zixaphir d4a3bc8a17 Merge branch 'v3' ...

Conflicts:
	CHANGELOG.md
	Gruntfile.coffee
	LICENSE
	builds/4chan-X.user.js
	builds/crx/manifest.json
	builds/crx/script.js
	latest.js
	package.json
	src/General/Config.coffee
	src/General/Header.coffee
	src/General/Settings.coffee
	src/General/css/font-awesome.css
	src/Images/FappeTyme.coffee
	src/Images/Gallery.coffee
	src/Images/ImageExpand.coffee
	src/Monitoring/Favicon.coffee
	src/Monitoring/ThreadWatcher.coffee
	src/Posting/QuickReply.coffee

2013-08-24 13:57:27 -07:00

..

crx

Merge branch 'v3'

2013-08-24 13:57:27 -07:00

4chan-X.meta.js

Release 4chan X v1.2.35.

2013-08-20 15:19:31 -07:00

4chan-X.user.js

Cleanup

2013-08-24 13:10:03 -07:00

appchan-x.meta.js

Release appchan x v2.3.6.

2013-08-21 13:17:52 -07:00

appchan-x.user.js

Merge branch 'v3'

2013-08-24 13:57:27 -07:00

appchan-x.zip

Release appchan x v2.3.6.

2013-08-21 13:17:52 -07:00