aboutsummaryrefslogtreecommitdiffstats
path: root/package.json
diff options
context:
space:
mode:
authorLibravatar Stefan Malzner <stefan@adlk.io>2018-12-01 22:50:55 +0100
committerLibravatar Stefan Malzner <stefan@adlk.io>2018-12-01 22:50:55 +0100
commit7fb698961c697f70a9dba0d5b60db8caf010e095 (patch)
tree639201edd94b82bafc85c8a9348ba98891b85c0c /package.json
parentsplit features into features and anonymousFeatures (diff)
parentWork with dev-app-update.yml & switch to debugger (diff)
downloadferdium-app-7fb698961c697f70a9dba0d5b60db8caf010e095.tar.gz
ferdium-app-7fb698961c697f70a9dba0d5b60db8caf010e095.tar.zst
ferdium-app-7fb698961c697f70a9dba0d5b60db8caf010e095.zip
Merge branch 'develop' into release/5.0.0-beta.19
Diffstat (limited to 'package.json')
-rw-r--r--package.json4
1 files changed, 2 insertions, 2 deletions
diff --git a/package.json b/package.json
index a894d65f0..24f922383 100644
--- a/package.json
+++ b/package.json
@@ -40,7 +40,7 @@
40 "electron-fetch": "1.3.0", 40 "electron-fetch": "1.3.0",
41 "electron-hunspell": "0.1.1", 41 "electron-hunspell": "0.1.1",
42 "electron-react-titlebar": "0.8.1", 42 "electron-react-titlebar": "0.8.1",
43 "electron-updater": "^4.0.4", 43 "electron-updater": "3.2.3",
44 "electron-window-state": "^4.1.0", 44 "electron-window-state": "^4.1.0",
45 "fs-extra": "7.0.1", 45 "fs-extra": "7.0.1",
46 "gulp-cli": "1.2.2", 46 "gulp-cli": "1.2.2",
@@ -99,7 +99,7 @@
99 "cz-conventional-changelog": "^2.0.0", 99 "cz-conventional-changelog": "^2.0.0",
100 "dotenv": "^4.0.0", 100 "dotenv": "^4.0.0",
101 "electron": "^2.0.13", 101 "electron": "^2.0.13",
102 "electron-builder": "^20.36.2", 102 "electron-builder": "20.35.0",
103 "electron-rebuild": "^1.6.0", 103 "electron-rebuild": "^1.6.0",
104 "eslint": "^4.7.1", 104 "eslint": "^4.7.1",
105 "eslint-config-airbnb": "^14.1.0", 105 "eslint-config-airbnb": "^14.1.0",