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

..

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

Holy consistent implementations, Batman!

2014-01-19 05:29: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 'v3'

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