Skip to content

Commit

Permalink
Merge branch 'dev' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
Koenkk authored Dec 25, 2023
2 parents 1a3662d + 0385791 commit 16494e8
Show file tree
Hide file tree
Showing 2 changed files with 66 additions and 66 deletions.
120 changes: 60 additions & 60 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
"jszip": "^3.10.1",
"mkdir-recursive": "^0.4.0",
"moment": "^2.29.4",
"mqtt": "^5.3.3",
"mqtt": "^5.3.4",
"object-assign-deep": "^0.4.0",
"rimraf": "^5.0.5",
"semver": "^7.5.4",
Expand All @@ -61,8 +61,8 @@
"winston-syslog": "^2.7.0",
"winston-transport": "^4.6.0",
"ws": "^8.15.1",
"zigbee-herdsman": "0.27.1",
"zigbee-herdsman-converters": "16.16.0",
"zigbee-herdsman": "0.28.0",
"zigbee-herdsman-converters": "16.17.0",
"zigbee2mqtt-frontend": "0.6.149"
},
"devDependencies": {
Expand All @@ -76,13 +76,13 @@
"@types/humanize-duration": "^3.27.3",
"@types/jest": "^29.5.11",
"@types/js-yaml": "^4.0.9",
"@types/node": "^20.10.4",
"@types/node": "^20.10.5",
"@types/object-assign-deep": "^0.4.3",
"@types/readable-stream": "4.0.10",
"@types/rimraf": "^3.0.2",
"@types/ws": "8.5.10",
"@typescript-eslint/eslint-plugin": "^6.14.0",
"@typescript-eslint/parser": "^6.14.0",
"@typescript-eslint/eslint-plugin": "^6.15.0",
"@typescript-eslint/parser": "^6.15.0",
"babel-jest": "^29.7.0",
"eslint": "^8.56.0",
"eslint-config-google": "^0.14.0",
Expand Down

0 comments on commit 16494e8

Please sign in to comment.