Zixaphir 8536ae3d37 Merge branch 'v3' ...

Conflicts:
	CHANGELOG.md
	LICENSE
	builds/appchan-x.user.js
	builds/crx/manifest.json
	builds/crx/script.js
	builds/updates.xml
	latest.js
	package.json

2014-04-04 16:12:31 -07:00

..

AutoGIF.coffee

Merge pull request #1412 from MayhemYDG/catalog

2014-02-05 18:03:40 +01:00

FappeTyme.coffee

Merge branch 'v3'

2014-03-06 23:07:49 -07:00

Gallery.coffee

Merge branch 'v3'

2014-03-06 23:07:49 -07:00

ImageExpand.coffee

Merge branch 'v3'

2014-04-04 16:12:31 -07:00

ImageHover.coffee

Merge branch 'ccd0' into v3

2014-04-04 16:10:07 -07:00

ImageLoader.coffee

Remove some accidental cruft left from incorrectly merging

2014-03-02 18:59:35 -07:00

RevealSpoilers.coffee

waddafuck

2014-03-15 15:35:50 -07:00

Sauce.coffee

Merge branch 'mayhem' into v3 -- Still broken, do not merge (yet)

2014-02-23 14:04:45 -07:00