Zixaphir d7ceb42446 Merge branch 'v3'
Conflicts:
	CHANGELOG.md
	LICENSE
	builds/4chan-X.meta.js
	builds/appchan-x.user.js
	builds/crx/manifest.json
	builds/crx/script.js
	latest.js
	package.json
	src/General/Header.coffee
	src/General/css/font-awesome.css
	src/Miscellaneous/CatalogLinks.coffee
2013-12-18 16:17:11 -07:00
..
2013-12-18 16:17:11 -07:00
2013-12-16 20:21:30 -07:00
2013-12-18 16:17:11 -07:00
2013-12-16 20:21:30 -07:00