Zixaphir 6dd0cac797 Merge branch 'master' of https://github.com/Spittie/4chan-x into v3 ...

Conflicts:
	CHANGELOG.md
	LICENSE
	builds/4chan-X.meta.js
	builds/4chan-X.user.js
	builds/crx/script.js
	src/Archive/Redirect.coffee
	src/General/Header.coffee
	src/Monitoring/Favicon.coffee

2014-02-16 01:00:41 -07:00

..

AnnouncementHiding.coffee

Merge branch 'mayhem' into v3

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

Banner.coffee

Zixaphir is a tough boss

2013-08-16 16:45:22 -07:00

CatalogLinks.coffee

Fix not var in obj, var not in obj

2013-12-24 16:31:09 -07:00

CustomCSS.coffee

Merge Zixaphir X

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

Dice.coffee

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

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

Emoji.coffee

Add OpenSUSE emoji

2014-02-10 15:44:48 +01:00

ExpandComment.coffee

remove [].contains. It was a bad idea.

2013-12-24 14:41:21 -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

Start work on infinite scrolling

2014-01-12 01:15:31 -07:00

Nav.coffee

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

2013-12-09 19:00:56 -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