Blade Barringer 8f90d154a0 Merge remote-tracking branch 'upstream/develop' into mountmaster ...

Conflicts:
	dist/habitrpg-shared.css
	dist/spritesmith0.css
	dist/spritesmith0.png
	dist/spritesmith1.css
	dist/spritesmith1.png
	dist/spritesmith2.css
	dist/spritesmith2.png
	dist/spritesmith3.css
	dist/spritesmith3.png

2015-01-08 11:30:53 -06:00

..

simulations

chore(): update dependencies (not moment because we keep the same version as habitrpg), move tests from /tests to /test so that it correctly uses mocha.opts

2014-02-22 17:10:29 +01:00

algos.mocha.coffee

Merge remote-tracking branch 'upstream/develop' into mountmaster

2015-01-08 11:30:53 -06:00

mocha.opts

chore(): update dependencies (not moment because we keep the same version as habitrpg), move tests from /tests to /test so that it correctly uses mocha.opts

2014-02-22 17:10:29 +01:00

test_helper.coffee

Refactoring tests, added custom matchers for helpful error messages

2014-03-22 20:15:06 -03:00