Zixaphir 64c9c139c1 Merge branch 'v3' ...

Conflicts:
	LICENSE
	builds/appchan-x.user.js
	builds/crx/script.js
	src/Archive/archives.json
	src/General/Config.coffee
	src/General/Header.coffee
	src/General/Settings.coffee
	src/Images/FappeTyme.coffee
	src/Posting/QR.coffee
	src/Posting/QR.post.coffee

2014-06-22 07:13:41 -07:00

..

FappeTyme.coffee

Merge branch 'mayhem' into v3

2014-06-22 07:04:25 -07:00

Gallery.coffee

Merge branch 'v3'

2014-06-22 07:13:41 -07:00

ImageExpand.coffee

Merge branch 'v3'

2014-06-22 07:13:41 -07:00

ImageHover.coffee

This is causing more issues than it's preventing.

2014-05-03 06:44:01 -07:00

ImageLoader.coffee

Merge branch 'mayhem' into v3

2014-06-22 07:04:25 -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

TrashQueue.coffee

get new hover working in catalog

2014-04-06 16:06:11 -07:00

Video.coffee

forgot to add this file

2014-04-10 01:35:37 -07:00