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
..
2013-05-06 16:54:39 -07:00
2013-05-06 13:47:09 -07:00
2013-05-06 16:54:39 -07:00
2013-04-28 21:20:22 -07:00
2013-05-06 16:54:39 -07:00
crx
2013-05-03 12:17:04 -07:00
2013-05-03 15:16:40 -07:00