Zixaphir 72e3fc2585 Merge branch 'v3' ...

Conflicts:
	CHANGELOG.md
	Gruntfile.coffee
	LICENSE
	builds/appchan-x.user.js
	builds/crx/manifest.json
	builds/crx/script.js
	package.json
	src/General/Config.coffee
	src/General/Header.coffee
	src/General/Main.coffee
	src/General/Settings.coffee
	src/General/html/Features/QuickReply.html
	src/General/img/favicons/xat-/unreadDead.png
	src/General/img/favicons/xat-/unreadDeadY.png
	src/General/img/favicons/xat-/unreadNSFW.png
	src/General/img/favicons/xat-/unreadNSFWY.png
	src/General/img/favicons/xat-/unreadSFW.png
	src/General/img/favicons/xat-/unreadSFWY.png
	src/General/meta/banner.js
	src/General/meta/metadata.js
	src/Images/ImageExpand.coffee
	src/Monitoring/Favicon.coffee
	src/Monitoring/ThreadWatcher.coffee
	src/Posting/QuickReply.coffee

2013-08-18 11:17:07 -07:00

..

QuoteBacklink.coffee

Merge branch 'v3'

2013-08-15 23:02:54 -07:00

QuoteCT.coffee

Merge Zixaphir X

2013-08-14 03:12:10 -07:00

QuoteInline.coffee

Merge Zixaphir X

2013-08-12 00:07:39 -07:00

QuoteOP.coffee

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

2013-08-17 20:33:48 -07:00

QuotePreview.coffee

Merge Zixaphir X

2013-08-12 00:07:39 -07:00

QuoteStrikeThrough.coffee

Merge Zixaphir X

2013-08-12 00:07:39 -07:00

QuoteThreading.coffee

Merge Zixaphir X

2013-08-12 00:07:39 -07:00

QuoteYou.coffee

Merge branch 'v3'

2013-08-18 11:17:07 -07:00

Quotify.coffee

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

2013-08-17 20:33:48 -07:00