Zixaphir 34140232fb Merge branch 'v3' ...

Conflicts:
	CHANGELOG.md
	LICENSE
	builds/4chan-X.meta.js
	builds/4chan-X.user.js
	builds/appchan-x.user.js
	builds/crx/manifest.json
	builds/crx/script.js
	latest.js
	package.json
	src/Filtering/ThreadHiding.coffee
	src/General/Config.coffee
	src/General/Header.coffee
	src/General/Main.coffee
	src/General/Settings.coffee
	src/General/css/font-awesome.css
	src/General/lib/notice.class
	src/General/meta/metadata.js
	src/Images/Gallery.coffee
	src/Images/ImageExpand.coffee
	src/Monitoring/Favicon.coffee
	src/Monitoring/ThreadWatcher.coffee
	src/Posting/QuickReply.coffee

worksforme.png

2013-11-23 12:56:42 -07:00

..

crx

Merge branch 'v3'

2013-11-23 12:56:42 -07:00

4chan-X.meta.js

Merge branch 'master' of https://github.com/seaweedchan/4chan-x into v3

2013-11-23 11:17:11 -07:00

4chan-X.user.js

::before

2013-11-23 12:23:37 -07:00

appchan-x.meta.js

Merge branch 'v3'

2013-11-23 12:56:42 -07:00

appchan-x.user.js

Merge branch 'v3'

2013-11-23 12:56:42 -07:00

appchan-x.zip

Release appchan x v2.5.1.

2013-10-20 00:16:05 -07:00