Zixaphir 453ebe7e74 Merge branch 'v3' ...

Conflicts:
	CHANGELOG.md
	builds/appchan-x.user.js
	builds/crx/script.js
	src/Images/ImageExpand.coffee
	src/Images/ImageHover.coffee

2014-04-04 20:28:21 -07:00

..

audio

Merge Zixaphir X

2013-08-12 00:07:39 -07:00

css

Merge branch 'v3'

2014-04-04 20:28:21 -07:00

html

Due to popular request, restore the catalog button.

2014-03-14 18:59:05 -07:00

img

Merge branch 'v3'

2014-04-03 15:19:41 -07:00

lib

Merge branch 'v3'

2014-04-04 20:28:21 -07:00

meta

Damn typos.

2014-04-04 16:27:37 -07:00

Build.coffee

Merge branch 'mayhem' into v3

2014-04-04 20:24:12 -07:00

Cheats.coffee

Rethink our indexOf implementation

2014-01-13 12:08:53 -07:00

Config.coffee

Merge branch 'v3'

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

Get.coffee

Oops

2014-03-14 17:29:02 -07:00

Globals.coffee

Merge branch 'v3'

2014-01-17 13:23:36 -07:00

Header.coffee

Merge branch 'v3'

2014-03-27 13:55:02 -07:00

Index.coffee

Merge branch 'v3'

2014-03-23 14:33:16 -07:00

Main.coffee

Merge branch 'v3'

2014-03-20 09:57:27 -07:00

Navigate.coffee

Merge branch 'v3'

2014-03-20 09:57:27 -07:00

Settings.coffee

Merge branch 'v3'

2014-04-04 20:28:21 -07:00

UI.coffee

Change some things around

2014-04-04 17:05:53 -07:00