Gittes-archive/spacedrive
2
0
Fork 0
mirror of https://github.com/spacedriveapp/spacedrive.git synced 2025-12-11 20:15:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

More merge fixes

Browse Source
This commit is contained in:
Arnab Chakraborty 2024-08-13 14:08:13 +03:00
parent 541e228410
commit 54b72a7015
3 changed files with 514 additions and 416 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

927
Cargo.lock generated
View File

File diff suppressed because it is too large Load Diff

1
crates/utils/Cargo.toml
View File

@ -13,3 +13,4 @@ prisma-client-rust = { workspace = true }
rspc = { workspace = true, features = ["unstable"] }
thiserror = { workspace = true }
uuid = { workspace = true }
tracing = { workspace = true }

2
packages/client/src/core.ts
View File

@ -245,7 +245,7 @@ export type Device = { pub_id: DevicePubId; name: string; os: DeviceOS; storage_
export type DeviceDeleteRequest = { access_token: AccessToken; pub_id: DevicePubId }
export type DeviceOS = "Linux" | "Windows" | "MacOS" | "IOS" | "Android"
export type DeviceOS = "Linux" | "Windows" | "MacOS" | "iOS" | "Android"
export type DevicePubId = string