Zixaphir 0415de74c1 Merge branch 'master' of https://github.com/seaweedchan/4chan-x into v3 ...

Conflicts:
	CHANGELOG.md
	Gruntfile.coffee
	LICENSE
	builds/4chan-X.user.js
	builds/crx/script.js
	json/archives.json
	package.json
	src/Archive/Redirect.coffee
	src/General/Build.coffee
	src/General/Config.coffee
	src/General/html/Build/post.html
	src/Monitoring/ThreadUpdater.coffee
	src/Posting/QuickReply.coffee

2013-10-13 14:29:52 -07:00

..

QuickReply.coffee

Merge branch 'master' of https://github.com/seaweedchan/4chan-x into v3

2013-10-13 14:29:52 -07:00