Merge branch 'master' into glitch-soc/merge-upstream

2019-07-24 16:23:53 +02:00
parent e3a551cbd1 94f5c714f1
commit 2d35e4460a
11 changed files with 146 additions and 119 deletions
--- a/package.json
+++ b/package.json
@@ -87,7 +87,7 @@
    "classnames": "^2.2.5",
    "compression-webpack-plugin": "^3.0.0",
    "cross-env": "^5.1.4",
-    "css-loader": "^2.1.1",
+    "css-loader": "^3.1.0",
    "cssnano": "^4.1.10",
    "detect-passive-events": "^1.0.2",
    "dotenv": "^8.0.0",