merge master -> gl-33

yyx990803 · May 15, 2016 · b575bb2 · b575bb2
2 parents 3ec933e + 4d08c80
commit b575bb2
Show file tree

Hide file tree

Showing 23 changed files with 327 additions and 290 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,5 @@
 .DS_Store
 node_modules
 dist
-test/**/actual
+test/**/actual
+sandbox
diff --git a/package.json b/package.json
@@ -59,7 +59,7 @@
   "dependencies": {
     "acorn": "^3.0.4",
     "chalk": "^1.1.3",
-    "magic-string": "^0.12.1",
+    "magic-string": "^0.13.1",
     "minimist": "^1.2.0"
   }
 }