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

Conflicts:
	CHANGELOG.md
	css/style.css
	src/Archive/Redirect.coffee
	src/General/Build.coffee
	src/General/Config.coffee
	src/General/Header.coffee
	src/General/Main.coffee
	src/General/Settings.coffee
	src/General/lib/$.coffee
	src/General/lib/databoard.class
	src/Monitoring/ThreadStats.coffee
	src/Monitoring/ThreadUpdater.coffee
	src/Monitoring/ThreadWatcher.coffee

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

..

AnnouncementHiding.coffee

Merge Mayhem X

2013-06-14 03:14:54 -07:00

CatalogLinks.coffee

Fix #298

2013-08-08 14:35:26 -07:00

ColorUserIDs.coffee

And a couple more fixes #136

2013-08-08 14:27:38 -07:00

CustomCSS.coffee

Merge Mayhem's structure

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

Dice.coffee

Shorter dice format.

2013-08-10 15:05:44 +02:00

Emoji.coffee

Further update to structure change

2013-04-26 14:19:20 -07:00

ExpandComment.coffee

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

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

ExpandThread.coffee

Personal choices

2013-08-06 12:14:23 -07:00

FileInfo.coffee

Merge Mayhem's structure

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

Fourchan.coffee

No need to use   to preserve whitespaces anymore.

2013-06-08 20:20:59 +02:00

Keybinds.coffee

Keybind to scroll to posts quoting you.

2013-08-08 23:53:48 -07:00

Nav.coffee

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

2013-07-21 08:39:40 -07:00

RelativeDates.coffee

Merge Mayhem's structure

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

RemoveSpoilers.coffee

Indicate Spoilers -> Reveal Spoilers, changelog

2013-06-14 03:37:41 -07:00

Report.coffee

Another indexOf I missed.

2013-07-24 22:06:08 -07:00

Time.coffee

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

2013-08-09 19:36:40 -07:00