merge from 1.x

tauri-apps · Feb 19, 2024 · c426c0d · c426c0d
2 parents 77f49ad + e816a46
commit c426c0d
Show file tree

Hide file tree

Showing 44 changed files with 6,880 additions and 925 deletions.
diff --git a/.gitignore b/.gitignore
@@ -73,7 +73,7 @@ TODO.md
 target
 
 # lock for libs
-/Cargo.lock
+#/Cargo.lock Committed to prevent msrv checks from failing
 /tooling/bench/tests/Cargo.lock
 /yarn.lock