Merge remote-tracking branch 'origin/master' into hermes/hermes-1e775b03
# Conflicts: # server-rs/crates/api-server/src/app.rs # server-rs/crates/api-server/src/creation_entry_config.rs # server-rs/crates/api-server/src/puzzle.rs # server-rs/crates/spacetime-client/src/lib.rs # src/components/platform-entry/PlatformEntryFlowShellImpl.tsx
This commit is contained in:
2
server-rs/Cargo.lock
generated
2
server-rs/Cargo.lock
generated
@@ -81,6 +81,7 @@ dependencies = [
|
||||
"async-stream",
|
||||
"axum",
|
||||
"base64 0.22.1",
|
||||
"bytes",
|
||||
"dotenvy",
|
||||
"futures-util",
|
||||
"hmac",
|
||||
@@ -110,6 +111,7 @@ dependencies = [
|
||||
"platform-oss",
|
||||
"platform-speech",
|
||||
"reqwest 0.12.28",
|
||||
"ring",
|
||||
"serde",
|
||||
"serde_json",
|
||||
"sha2",
|
||||
|
||||
Reference in New Issue
Block a user