Merge remote-tracking branch 'origin/v1' into v1-into-v2-again

This commit is contained in:
FabianLars
2023-11-23 17:50:47 +01:00
36 changed files with 1050 additions and 328 deletions
Generated
+10 -1
View File
@@ -6112,7 +6112,7 @@ dependencies = [
"serde_json",
"tauri",
"thiserror",
"windows-sys 0.48.0",
"windows-sys 0.52.0",
"zbus",
]
@@ -7428,6 +7428,15 @@ dependencies = [
"windows-targets 0.48.5",
]
[[package]]
name = "windows-sys"
version = "0.52.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
dependencies = [
"windows-targets 0.52.0",
]
[[package]]
name = "windows-targets"
version = "0.42.2"