diff options
| author |  Amine Mouafik <amine@mouafik.fr> | 2020-10-01 21:59:23 +0100 |
|---|---|---|
| committer | Amine Mouafik <amine@mouafik.fr> | 2020-10-01 21:59:23 +0100 |
| commit | b5a58d6b530ac82f82a017e5ddc5bc2ee98981a2 (patch) | |
| tree | d777ee6de7dba6de488a922161a72878d41f1f49 /package.json | |
| parent | Merge branch 'develop' into nightly (diff) | |
| parent | Update social preview for repositories and twitter header (diff) | |
| download | ferdium-app-b5a58d6b530ac82f82a017e5ddc5bc2ee98981a2.tar.gz ferdium-app-b5a58d6b530ac82f82a017e5ddc5bc2ee98981a2.tar.zst ferdium-app-b5a58d6b530ac82f82a017e5ddc5bc2ee98981a2.zip | |
Merge branch 'develop' into nightly
# Conflicts:
# package-lock.json
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 615e20280..0c40063a3 100644 --- a/package.json +++ b/package.json | |||
| @@ -91,7 +91,7 @@ | |||
| 91 | "lodash": "^4.17.4", | 91 | "lodash": "^4.17.4", |
| 92 | "mac-screen-capture-permissions": "1.1.0", | 92 | "mac-screen-capture-permissions": "1.1.0", |
| 93 | "macos-version": "5.2.0", | 93 | "macos-version": "5.2.0", |
| 94 | "marked": "0.6.1", | 94 | "marked": "0.7.0", |
| 95 | "mdi": "^1.9.33", | 95 | "mdi": "^1.9.33", |
| 96 | "mime-types": "2.1.25", | 96 | "mime-types": "2.1.25", |
| 97 | "mobx": "5.15.0", | 97 | "mobx": "5.15.0", |
| @@ -101,7 +101,7 @@ | |||
| 101 | "mobx-react-router": "3.1.2", | 101 | "mobx-react-router": "3.1.2", |
| 102 | "moment": "^2.17.1", | 102 | "moment": "^2.17.1", |
| 103 | "ms": "2.1.2", | 103 | "ms": "2.1.2", |
| 104 | "node-fetch": "2.6.0", | 104 | "node-fetch": "2.6.1", |
| 105 | "normalize-url": "5.0.0", | 105 | "normalize-url": "5.0.0", |
| 106 | "pretty-bytes": "^4.0.2", | 106 | "pretty-bytes": "^4.0.2", |
| 107 | "prop-types": "^15.5.10", | 107 | "prop-types": "^15.5.10", |