Zixaphir e459069ae6 Merge branch 'v3' ...

Conflicts:
	CHANGELOG.md
	LICENSE
	builds/appchan-x.user.js
	builds/crx/script.js
	src/General/Config.coffee
	src/General/css/style.css
	src/Miscellaneous/AnnouncementHiding.coffee
	src/Miscellaneous/InfiniScroll.coffee
	src/Posting/QR.coffee

2014-03-13 18:12:44 -07:00

..

AnnouncementHiding.coffee

Merge branch 'v3'

2014-03-13 18:12:44 -07:00

CatalogLinks.coffee

Get rid of more Catalog stuff

2014-03-07 17:12:43 -07:00

CustomCSS.coffee

Merge branch 'v3'

2014-03-06 20:15:45 -07:00

Dice.coffee

Merge branch 'mayhem' into v3 -- Still broken, do not merge (yet)

2014-02-23 14:04:45 -07:00

ExpandComment.coffee

Merge branch 'v3'

2014-03-06 20:15:45 -07:00

ExpandThread.coffee

Fix ExpandThread without JSON Navigation

2014-03-03 12:41:26 -07:00

FileInfo.coffee

Merge branch 'mayhem' into v3 -- Still broken, do not merge (yet)

2014-02-23 14:04:45 -07:00

Flash.coffee

switch from .navLinks to .swfSauce on /f/

2014-03-05 22:15:16 -08:00

Fourchan.coffee

Merge branch 'mayhem' into v3 -- Still broken, do not merge (yet)

2014-02-23 14:04:45 -07:00

IDColor.coffee

Merge branch 'mayhem' into v3 -- Still broken, do not merge (yet)

2014-02-23 14:04:45 -07:00

InfiniScroll.coffee

Remove InfiniScroll.coffee

2014-03-13 02:10:09 -07:00

Keybinds.coffee

Fix #633

2014-03-11 11:23:54 -07:00

Nav.coffee

Merge branch 'v3'

2014-03-06 20:15:45 -07:00

RelativeDates.coffee

Merge branch 'mayhem' into v3 (Bugtesting time... yey... ;__;)

2014-02-28 19:59:04 -07:00

RemoveSpoilers.coffee

resolve #472 2

2014-02-16 04:25:29 -07:00

Report.coffee

Remove some unwanted changes

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

Time.coffee

Merge branch 'mayhem' into v3 -- Still broken, do not merge (yet)

2014-02-23 14:04:45 -07:00