Zixaphir 1debf61f2e 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/Header.coffee
	src/General/Main.coffee
	src/General/Settings.coffee
	src/General/css/burichan.css
	src/General/css/futaba.css
	src/General/css/photon.css
	src/General/css/style.css
	src/General/css/tomorrow.css
	src/General/css/yotsuba-b.css
	src/General/css/yotsuba.css
	src/General/html/Settings/Advanced.html
	src/Monitoring/Favicon.coffee
	src/Monitoring/ThreadWatcher.coffee

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

..

AnnouncementHiding.coffee

Merge branch 'v3'

2013-05-10 02:41:08 -07:00

CatalogLinks.coffee

Merge branch 'v3'

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

ColorUserIDs.coffee

Merge Mayhem's structure

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

CustomCSS.coffee

Merge branch 'v3' into Av2

2013-04-28 21:20:22 -07:00

ExpandComment.coffee

Merge branch 'v3' into Av2

2013-05-03 07:17:59 -07:00

ExpandThread.coffee

Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3

2013-05-12 07:00:30 -07:00

FileInfo.coffee

Merge Mayhem's structure

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

Fourchan.coffee

Preserve whitespaces in code tags. Fix #1079

2013-05-04 20:01:52 +02:00

Keybinds.coffee

Fix some things broken by removing the Quick Reply option.

2013-05-10 02:48:15 -07:00

Nav.coffee

Merge branch 'v3'

2013-05-10 23:00:10 -07:00

RelativeDates.coffee

Merge Mayhem's structure

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

RemoveSpoilers.coffee

Merge Mayhem's structure

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

Report.coffee

Merge Mayhem's structure

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

Sauce.coffee

Workaround for old sauce configurations.

2013-05-10 13:43:58 -07:00

Time.coffee

Add @detharonil's %Y and more future-proof %y

2013-05-05 17:39:30 -07:00