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

..

style.css

Don't keep running waitExpand's asap func when the image error'd.

2014-04-09 10:20:32 +02:00