Skip to content

Commit

Permalink
Merge branch 'dev' of https://github.com/emsesp/EMS-ESP32 into idf4_n…
Browse files Browse the repository at this point in the history
…o_master
  • Loading branch information
MichaelDvP committed May 24, 2022
2 parents c502aa7 + 472b97e commit d3d9a93
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 11 deletions.
16 changes: 8 additions & 8 deletions interface/package-lock.json

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

4 changes: 2 additions & 2 deletions interface/package.json
Expand Up @@ -8,12 +8,12 @@
"@emotion/styled": "^11.8.1",
"@msgpack/msgpack": "^2.7.2",
"@mui/icons-material": "^5.8.0",
"@mui/material": "^5.8.0",
"@mui/material": "^5.8.1",
"@table-library/react-table-library": "^3.1.2",
"@types/lodash": "^4.14.182",
"@types/node": "^17.0.35",
"@types/react": "^18.0.9",
"@types/react-dom": "^18.0.4",
"@types/react-dom": "^18.0.5",
"@types/react-router-dom": "^5.3.3",
"async-validator": "^4.1.1",
"axios": "^0.27.2",
Expand Down
2 changes: 1 addition & 1 deletion src/version.h
@@ -1 +1 @@
#define EMSESP_APP_VERSION "3.4.0b18idf4"
#define EMSESP_APP_VERSION "3.4.1b0idf4"

0 comments on commit d3d9a93

Please sign in to comment.