Merge branch 'develop' into layer-ordering

2018-05-25 09:23:02 -04:00
parent 13a75b6a7b 4a737352d6
commit d8f82b21ec
5 changed files with 91 additions and 36 deletions
--- a/package.json
+++ b/package.json
@@ -44,7 +44,7 @@
    "minilog": "3.1.0",
    "raw-loader": "^0.5.1",
    "scratch-storage": "^0.4.0",
-    "scratch-svg-renderer": "0.1.0-prerelease.20180514170126",
+    "scratch-svg-renderer": "0.1.0-prerelease.20180524210316",
    "scratch-vm": "0.1.0-prerelease.1527254075",
    "tap": "^11.0.0",
    "travis-after-all": "^1.4.4",