Zixaphir b6749b91a5 Merge branch 'mayhem' into v3 ...

Conflicts:
	CHANGELOG.md
	CONTRIBUTING.md
	css/style.css
	html/General/Settings-section-Main.html
	json/archives.json
	package.json
	src/Archive/Redirect.coffee
	src/General/Header.coffee
	src/General/Main.coffee
	src/General/Settings.coffee
	src/General/lib/$.coffee
	src/General/lib/thread.class
	src/Linkification/Linkify.coffee
	src/Miscellaneous/AnnouncementHiding.coffee
	src/Monitoring/ThreadStats.coffee

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

..

Anonymize.coffee

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

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

Filter.coffee

Fix not var in obj, var not in obj

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

PostHiding.coffee

Font-awesome hide buttons, close #226

2014-01-09 03:05:46 -07:00

Recursive.coffee

I really don't like iterating through objects.

2014-01-14 20:17:44 -07:00

ThreadHiding.coffee

Merge branch 'mayhem' into v3

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