Zixaphir e459069ae6 Merge branch 'v3'
Conflicts:
	CHANGELOG.md
	LICENSE
	builds/appchan-x.user.js
	builds/crx/script.js
	src/General/Config.coffee
	src/General/css/style.css
	src/Miscellaneous/AnnouncementHiding.coffee
	src/Miscellaneous/InfiniScroll.coffee
	src/Posting/QR.coffee
2014-03-13 18:12:44 -07:00
..
2014-03-13 18:12:44 -07:00
2014-03-01 18:53:03 +01:00
2014-03-01 18:53:03 +01:00
2014-03-11 16:59:47 -07:00
2014-03-13 18:12:44 -07:00
2014-03-11 16:59:47 -07:00
2014-03-01 18:53:03 +01:00