Skip to content

Commit

Permalink
Merge branch 'master' into breaking_change_fix
Browse files Browse the repository at this point in the history
  • Loading branch information
spetz authored Mar 2, 2024
2 parents 55d5ba3 + 90e6034 commit 9526f30
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
12 changes: 6 additions & 6 deletions Cargo.lock

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

4 changes: 2 additions & 2 deletions server/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -41,13 +41,13 @@ rcgen = "0.12.1"
ring = "0.17.8"
rmp-serde = "1.1.2"
rustls = { version = "0.21.10" }
rustls-pemfile = "2.1.0"
rustls-pemfile = "2.1.1"
serde = { version = "1.0.197", features = ["derive", "rc"] }
serde_json = "1.0.114"
serde_with = { version = "3.6.1", features = ["base64", "macros"] }
sled = "0.34.7"
strip-ansi-escapes = "0.2.0"
sysinfo = "0.30.5"
sysinfo = "0.30.6"
thiserror = "1.0.57"
tokio = { version = "1.36.0", features = ["full"] }
tokio-native-tls = "0.3.1"
Expand Down

0 comments on commit 9526f30

Please sign in to comment.