Zixaphir 2ac2286ad5 Merge branch 'mayhem' into v3 ...

Conflicts:
	CHANGELOG.md
	src/General/lib/$.coffee
	src/Images/Sauce.coffee

2014-01-28 01:11:06 -07:00

..

icon16.png

Merge Zixaphir X

2013-08-12 00:07:39 -07:00

icon48.png

Merge Zixaphir X

2013-08-12 00:07:39 -07:00

icon128.png

Merge Zixaphir X

2013-08-12 00:07:39 -07:00

manifest.json

Release 4chan X v1.3.2.

2014-01-12 19:55:02 -07:00

script.js

Merge branch 'mayhem' into v3

2014-01-28 01:11:06 -07:00