Zixaphir 93b94ec9d0 Merge branch 'v3' into Av2 ...

Conflicts:
	LICENSE
	builds/4chan-X.meta.js
	builds/4chan-X.user.js
	builds/crx/manifest.json
	builds/crx/script.js
	builds/version
	package.json
	src/General/Main.coffee
	src/General/css/style.css
	src/Posting/QuickReply.coffee
	src/Quotelinks/QuoteInline.coffee

2013-05-06 16:54:39 -07:00

..

QuickReply.coffee

Merge branch 'v3' into Av2

2013-05-06 16:54:39 -07:00