Merge master into staging-next

2019-02-18 14:18:04 +01:00
parent 97c05bda52 107215c1d0
commit 815b77cbe6
118 changed files with 9944 additions and 3179 deletions
--- a/pkgs/development/interpreters/clojurescript/lumo/package.json
+++ b/pkgs/development/interpreters/clojurescript/lumo/package.json
@@ -36,7 +36,7 @@
    "rollup-plugin-node-resolve": "3.4.0",
    "rollup-plugin-replace": "2.1.0",
    "webpack": "^4.25.1",
-    "webpack-cli": "^3.1.2",
+    "webpack-cli": "^3.2.3",
    "which-promise": "^1.0.0"
  }
 }