Zixaphir 6dd0cac797 Merge branch 'master' of https://github.com/Spittie/4chan-x into v3
Conflicts:
	CHANGELOG.md
	LICENSE
	builds/4chan-X.meta.js
	builds/4chan-X.user.js
	builds/crx/script.js
	src/Archive/Redirect.coffee
	src/General/Header.coffee
	src/Monitoring/Favicon.coffee
2014-02-16 01:00:41 -07:00
..
2014-01-12 23:49:25 -07:00
2013-11-22 17:26:38 -07:00
2014-02-12 23:56:30 +01:00