diff options
author | Thibaut Girka <thib@sitedethib.com> | 2020-04-15 17:07:49 +0200 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2020-04-15 17:07:49 +0200 |
commit | 66ad30db489ddb2b3ecc98d284aabd47c9d4ae84 (patch) | |
tree | d8f035139c20e59c39bb35a74686783094c297da /package.json | |
parent | 615073df33b9a4317ac5c93fdef83c9cd34567fa (diff) | |
parent | 5524258da9bc1d62b1396d19c672d3a8335ffbc5 (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - `package.json`: No real conflict, upstream updated a dependency which is textually adjacent to a glitch-soc-specific dependency. Updated it. - `yarn.lock`: No real conflict, upstream updated a dependency which is textually adjacent to a glitch-soc-specific dependency. Updated it.
Diffstat (limited to 'package.json')
-rw-r--r-- | package.json | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/package.json b/package.json index 82f918456..684dff375 100644 --- a/package.json +++ b/package.json @@ -74,7 +74,7 @@ "array-includes": "^3.1.1", "arrow-key-navigation": "^1.1.0", "atrament": "0.2.4", - "autoprefixer": "^9.7.5", + "autoprefixer": "^9.7.6", "axios": "^0.19.2", "babel-loader": "^8.1.0", "babel-plugin-lodash": "^3.3.4", @@ -114,7 +114,7 @@ "mark-loader": "^0.1.6", "marky": "^1.2.1", "mini-css-extract-plugin": "^0.9.0", - "mkdirp": "^1.0.3", + "mkdirp": "^1.0.4", "npmlog": "^4.1.2", "object-assign": "^4.1.1", "object-fit-images": "^3.2.3", |