Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/github_actions/github-actions-3e8…
Browse files Browse the repository at this point in the history
…3326924
  • Loading branch information
alexhad6 authored Jan 22, 2024
2 parents 272d6bb + 4237956 commit 9079f06
Show file tree
Hide file tree
Showing 4 changed files with 194 additions and 29 deletions.
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"@emotion/styled": "^11.11.0",
"@fontsource/roboto": "^5.0.8",
"@mui/icons-material": "^5.15.3",
"@mui/lab": "^5.0.0-alpha.159",
"@mui/lab": "^5.0.0-alpha.160",
"@mui/material": "^5.15.3",
"deep-object-diff": "^1.1.9",
"fast-deep-equal": "^3.1.3",
Expand Down Expand Up @@ -51,7 +51,7 @@
"prettier": "^3.1.1",
"ts-node": "^10.9.2",
"typescript": "^5.3.3",
"vite": "^5.0.11",
"vite": "^5.0.12",
"wait-on": "^7.2.0",
"whatwg-fetch": "^3.6.20"
}
Expand Down
16 changes: 8 additions & 8 deletions poetry.lock

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

4 changes: 2 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ include = ["paramview/static/**/*"]

[tool.poetry.dependencies]
python = "^3.9"
flask = "^3.0.0"
flask = "^3.0.1"
flask-socketio = "^5.3.6"
eventlet = "^0.34.2"
eventlet = "^0.35.0"
watchdog = "^3.0.0"
paramdb = "^0.10.2"

Expand Down
Loading

0 comments on commit 9079f06

Please sign in to comment.