Zixaphir 9b9a2980aa Merge branch 'mayhem' into v3 ...

Conflicts:
	CHANGELOG.md
	README.md
	css/style.css
	html/General/Header.html
	package.json
	src/General/Config.coffee
	src/General/Header.coffee
	src/General/Settings.coffee
	src/Miscellaneous/AnnouncementHiding.coffee

2014-03-13 14:30:39 -07:00

..

ArchiveLink.coffee

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

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

DeleteLink.coffee

Fix quote highlighting.

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

DownloadLink.coffee

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

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

Labels.coffee

Hide threads like we hide them in the catalog.

2014-02-22 00:17:48 +01:00

Menu.coffee

Merge branch 'mayhem' into v3

2014-03-13 14:30:39 -07:00

ReportLink.coffee

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

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