Merge remote-tracking branch 'upstream/master' into file-manager-redesign

This commit is contained in:
NicKoehler
2023-02-22 23:01:31 +01:00
parent 922a70adb4
commit 12a33cdfbb
31 changed files with 488 additions and 282 deletions

2
Cargo.lock generated
View File

@@ -2623,6 +2623,7 @@ dependencies = [
"serde_json 1.0.89",
"socket2 0.3.19",
"sodiumoxide",
"sysinfo",
"tokio",
"tokio-socks",
"tokio-util",
@@ -4887,7 +4888,6 @@ dependencies = [
"shutdown_hooks",
"simple_rc",
"sys-locale",
"sysinfo",
"system_shutdown",
"tao",
"tray-icon",