Zixaphir d4a3bc8a17 Merge branch 'v3' ...

Conflicts:
	CHANGELOG.md
	Gruntfile.coffee
	LICENSE
	builds/4chan-X.user.js
	builds/crx/manifest.json
	builds/crx/script.js
	latest.js
	package.json
	src/General/Config.coffee
	src/General/Header.coffee
	src/General/Settings.coffee
	src/General/css/font-awesome.css
	src/Images/FappeTyme.coffee
	src/Images/Gallery.coffee
	src/Images/ImageExpand.coffee
	src/Monitoring/Favicon.coffee
	src/Monitoring/ThreadWatcher.coffee
	src/Posting/QuickReply.coffee

2013-08-24 13:57:27 -07:00

..

AnnouncementHiding.coffee

Start IconPositioner rewrite

2013-08-19 02:21:51 -07:00

CatalogLinks.coffee

Separate icons and "stats" in the shortcuts element

2013-08-21 11:26:48 -07:00

ColorUserIDs.coffee

Oversight

2013-08-24 11:32:14 -07:00

CustomCSS.coffee

Merge branch 'v3'

2013-08-15 23:02:54 -07:00

Dice.coffee

Merge Zixaphir X

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

ExpandComment.coffee

Add Linkification.

2013-08-18 20:53:08 +02:00

ExpandThread.coffee

Merge Zixaphir X

2013-08-14 03:12:10 -07:00

FileInfo.coffee

Merge Zixaphir X

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

Fourchan.coffee

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

2013-08-17 20:33:48 -07:00

Keybinds.coffee

Keybinds, Werk Tyme, more Mayhem-X-like IDColor

2013-08-24 11:24:49 -07:00

Nav.coffee

Separate icons and "stats" in the shortcuts element

2013-08-21 11:26:48 -07:00

RelativeDates.coffee

Merge Zixaphir X

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

RemoveSpoilers.coffee

Merge Zixaphir X

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

Report.coffee

Remove some unwanted changes

2013-08-12 01:21:22 -07:00

Time.coffee

Merge Zixaphir X

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