Ray Schamp a4cdb027ab Merge branch 'develop' of github.com:morantsur/scratch-vm into feature/serialization ...

# Conflicts:
#	src/playground/index.html
#	src/serialization/sb2.js
#	src/sprites/rendered-target.js
#	src/virtual-machine.js
#	test/unit/serialization_sb2.js

2017-04-26 11:44:53 -04:00

..

fixtures

Use ES6 linting rules in the project root

2017-04-24 15:37:58 -04:00

integration

Use ES6 linting rules in the project root

2017-04-24 15:37:58 -04:00

unit

Merge branch 'develop' of github.com:morantsur/scratch-vm into feature/serialization

2017-04-26 11:44:53 -04:00

.eslintrc.js

All linting other than console statements

2016-10-23 22:20:29 -04:00