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

Conflicts:
	CHANGELOG.md
	html/General/Settings-section-Rice.html
	img/changelog/3.9.0/0.png
	package.json
	src/Images/AutoGIF.coffee
	src/Images/RevealSpoilers.coffee
	src/Miscellaneous/ExpandComment.coffee
	src/Miscellaneous/IDColor.coffee
	src/Monitoring/Unread.coffee
	src/Posting/QuickReply.coffee
	src/Quotelinks/QuoteInline.coffee
	src/Quotelinks/QuotePreview.coffee
	src/Quotelinks/QuoteYou.coffee
	src/Quotelinks/Quotify.coffee

2013-10-13 13:53:38 -07:00

..

General

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

2013-10-13 13:53:38 -07:00