Zixaphir 33943a06eb Merge branch 'mayhem' into v3 ...

Conflicts:
	CHANGELOG.md
	css/style.css
	package.json
	src/General/Build.coffee
	src/General/Main.coffee
	src/Images/ImageExpand.coffee
	src/Images/ImageHover.coffee
	src/Monitoring/ThreadUpdater.coffee

2014-04-12 18:13:21 -07:00

..

icon16.png

Update .crx

2014-02-13 18:37:20 +01:00

icon48.png

Update .crx

2014-02-13 18:37:20 +01:00

icon128.png

Merge Zixaphir X

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

manifest.json

Merge branch 'mayhem' into v3

2014-04-12 18:13:21 -07:00

script.js

Merge branch 'mayhem' into v3

2014-04-12 18:13:21 -07:00