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

Conflicts:
	CHANGELOG.md
	package.json
	src/General/Build.coffee
	src/General/Index.coffee
	src/General/Main.coffee
	src/General/lib/post.class
	src/Monitoring/ThreadStats.coffee

2014-05-03 02:45:58 -07:00

..

style.css

Don't hide hr.desktop in threads.

2014-04-30 15:37:24 +02:00