Zixaphir f103fd0301 Merge branch 'mayhem' into v3 ...

Conflicts:
	CHANGELOG.md
	package.json
	src/Archive/archives.json
	src/General/Config.coffee
	src/General/Header.coffee
	src/General/Main.coffee
	src/General/Settings.coffee
	src/General/UI.coffee
	src/Miscellaneous/Keybinds.coffee
	src/Monitoring/ThreadUpdater.coffee
	src/Monitoring/Unread.coffee
	src/Posting/QR.captcha.coffee
	src/Posting/QR.coffee
	src/Posting/QR.post.coffee

2014-06-22 07:04:25 -07:00

..

crx

Merge branch 'mayhem' into v3

2014-06-22 07:04:25 -07:00

4chan-X.meta.js

Release 4chan X v1.7.33.

2014-05-10 23:22:40 -07:00

4chan-X.user.js

Merge branch 'mayhem' into v3

2014-06-22 07:04:25 -07:00

crx.crx

Release 4chan X v1.7.33.

2014-05-10 23:22:40 -07:00

updates.xml

Release 4chan X v1.7.33.

2014-05-10 23:22:40 -07:00