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

Conflicts:
	CHANGELOG.md
	html/General/Header.html
	package.json
	src/Filtering/PostHiding.coffee
	src/Filtering/ThreadHiding.coffee
	src/General/Get.coffee
	src/General/Header.coffee
	src/General/Main.coffee
	src/General/UI.coffee
	src/Menu/Menu.coffee
	src/Posting/QuickReply.coffee
	src/Quotelinks/QuoteOP.coffee

2013-08-14 03:02:03 -07:00

..

General

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

2013-08-14 03:02:03 -07:00