Zixaphir 217f1cd42c Merge branch 'v3' ...

Conflicts:
	CHANGELOG.md
	Gruntfile.coffee
	LICENSE
	builds/4chan-X.js
	builds/4chan-X.meta.js
	builds/crx/manifest.json
	builds/crx/script.js
	latest.js
	package.json
	src/General/Main.coffee
	src/Linkification/Linkify.coffee

2013-08-04 20:10:29 -07:00

..

FappeTyme.coffee

Merge branch 'v3'

2013-05-08 06:24:19 -07:00

ImageExpand.coffee

Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3

2013-07-21 08:39:40 -07:00

ImageHover.coffee

Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3

2013-07-21 08:39:40 -07:00

ImageLoader.coffee

Change order value

2013-05-25 23:39:50 -07:00

RevealSpoilers.coffee

Not sure how no one caught this.

2013-08-04 14:22:26 -07:00

Sauce.coffee

Merge branch 'v3'

2013-07-21 09:01:27 -07:00