Zixaphir 70d1d758ec Merge branch 'v3' ...

Conflicts:
	CHANGELOG.md
	LICENSE
	builds/4chan-X.js
	builds/4chan-X.meta.js
	builds/4chan-X.user.js
	builds/crx/manifest.json
	builds/crx/script.js
	latest.js
	package.json
	src/General/Main.coffee
	src/General/css/style.css
	src/Posting/QuickReply.coffee

2013-05-15 09:00:09 -07:00

..

audio

Merge Mayhem's structure

2013-04-26 14:04:12 -07:00

css

Merge branch 'v3'

2013-05-15 09:00:09 -07:00

html

Merge branch 'v3'

2013-05-14 11:40:38 -07:00

img

Merge branch 'v3'

2013-05-10 07:19:08 -07:00

lib

Merge branch 'v3'

2013-05-15 09:00:09 -07:00

meta

Merge branch 'v3'

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

Build.coffee

Uhm... this just werkz for me?

2013-05-10 13:56:31 -07:00

Config.coffee

Merge branch 'v3'

2013-05-15 09:00:09 -07:00

Get.coffee

Add @MayhemYDG's archive redirection

2013-05-12 09:00:00 -07:00

Globals.coffee

Merge branch 'v3'

2013-05-15 09:00:09 -07:00

Header.coffee

Some obscure issue where #boardNavDesktop is missing, investigating it.

2013-05-14 22:25:45 +02:00

Main.coffee

Merge branch 'v3'

2013-05-15 09:00:09 -07:00

Settings.coffee

Merge branch 'v3'

2013-05-15 09:00:09 -07:00

UI.coffee

Merge branch 'v3'

2013-05-14 11:40:38 -07:00