Zixaphir ca4be499a3 Merge branch 'v3' ...

Conflicts:
	CHANGELOG.md
	LICENSE
	builds/4chan-X.js
	builds/4chan-X.meta.js
	builds/4chan-X.user.js
	builds/crx/manifest.json
	builds/crx/script.js
	latest.js
	package.json
	src/General/Main.coffee
	src/General/css/style.css

2013-05-27 14:22:31 -07:00

..

QuickReply.coffee

Merge branch 'v3'

2013-05-27 14:22:31 -07:00