Zixaphir 2efa358131 Merge branch 'v3' ...

Conflicts:
	CHANGELOG.md
	LICENSE
	builds/appchan-x.user.js
	builds/crx/manifest.json
	builds/crx/script.js
	package.json
	src/General/Navigate.coffee
	src/Miscellaneous/CatalogLinks.coffee
	src/Posting/QR.coffee

2014-05-27 12:39:01 -07:00

..

audio

Merge Zixaphir X

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

css

Merge branch 'v3'

2014-05-27 12:39:01 -07:00

html

Merge branch 'v3'

2014-05-27 12:39:01 -07:00

img

Merge branch 'v3'

2014-04-11 00:29:52 -07:00

lib

apply Mayhem's quoting fix

2014-05-03 08:23:02 -07:00

meta

Merge branch 'v3'

2014-04-11 00:29:52 -07:00

Build.coffee

Merge branch 'mayhem' into v3

2014-05-11 16:08:51 -07:00

Cheats.coffee

Rethink our indexOf implementation

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

Config.coffee

Merge branch 'v3'

2014-05-03 06:20:04 -07:00

Get.coffee

apply Mayhem's quoting fix

2014-05-03 08:23:02 -07:00

Globals.coffee

Merge branch 'v3'

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

Header.coffee

Merge branch 'ccd0' into v3

2014-05-03 02:03:35 -07:00

Index.coffee

Merge branch 'v3'

2014-05-27 12:39:01 -07:00

Main.coffee

Merge branch 'v3'

2014-05-27 12:39:01 -07:00

Navigate.coffee

Merge branch 'v3'

2014-05-27 12:39:01 -07:00

Settings.coffee

Merge branch 'v3'

2014-05-27 12:39:01 -07:00

UI.coffee

Merge branch 'v3'

2014-04-11 00:29:52 -07:00