Merge branch 'dev' into add/image

platform-coop-toolkit · Mar 18, 2020 · ff7c905 · ff7c905
2 parents fc6125d + caab15f
commit ff7c905
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 34 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -91,7 +91,7 @@
     "npm-run-all": "^4.1.5",
     "resolve-url-loader": "^3.1.1",
     "rimraf": "^3.0.2",
-    "rollup": "^1.32.1",
+    "rollup": "^2.0.6",
     "rollup-plugin-babel": "^4.4.0",
     "rollup-plugin-commonjs": "^10.1.0",
     "rollup-plugin-node-resolve": "^5.2.0",