Zixaphir 1f49ef2212 Merge branch 'v3' ...

Conflicts:
	CHANGELOG.md
	LICENSE
	builds/appchan-x.user.js
	builds/crx/script.js
	src/General/Main.coffee
	src/General/Settings.coffee
	src/General/html/Settings/Settings.html
	src/Miscellaneous/AnnouncementHiding.coffee

2014-01-26 11:40:50 -07:00

..

AnnouncementHiding.coffee

Merge branch 'v3'

2014-01-26 11:40:50 -07:00

CatalogLinks.coffee

Merge branch 'v3'

2013-12-24 16:32:48 -07:00

CustomCSS.coffee

Merge branch 'v3'

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

Dice.coffee

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

2013-10-13 13:53:38 -07:00

ExpandComment.coffee

Merge branch 'v3'

2013-12-24 16:18:47 -07:00

ExpandThread.coffee

Merge branch 'mayhem' into v3

2014-01-22 12:10:34 -07:00

FileInfo.coffee

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

2013-12-09 19:00:56 -07:00

Fourchan.coffee

Merge -- probably bugged until I sort out everything

2013-11-22 17:25:06 -07:00

IDColor.coffee

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

2013-10-16 13:53:47 -07:00

InfiniScroll.coffee

Fix Infinite Scrolling on Chrome.

2013-10-20 00:21:15 -07:00

Keybinds.coffee

Merge branch 'v3'

2014-01-12 14:56:32 -07:00

Nav.coffee

Merge branch 'v3'

2013-12-16 14:01:47 -07:00

RelativeDates.coffee

Merge -- probably bugged until I sort out everything

2013-11-22 17:25:06 -07:00

RemoveSpoilers.coffee

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

2013-10-13 13:53:38 -07:00

Report.coffee

Remove some unwanted changes

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

Time.coffee

MediaCrush embedding (the right way?)

2013-10-16 14:31:18 -07:00