bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2025-12-21 18:53:29 +00:00
Code Issues Releases Wiki Activity

Merge branch 'PM-26250-Explore-options-to-enable-direct-importer-for-mac-app-store-build' of github.com:bitwarden/clients into PM-26250-Explore-options-to-enable-direct-importer-for-mac-app-store-build

Browse Source 
merge conflict resolution
This commit is contained in:
John Harrington
2025-11-21 08:13:34 -07:00
parent 4be25d9290 245171e999
commit 5fc55c86a0
288 changed files with 7687 additions and 3967 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
apps/desktop/desktop_native/objc/Cargo.toml
View File

@@ -8,17 +8,14 @@ publish = { workspace = true }
[features]
default = []
[dependencies]
[target.'cfg(target_os = "macos")'.dependencies]
anyhow = { workspace = true }
thiserror = { workspace = true }
tokio = { workspace = true, features = ["sync"] }
tracing = { workspace = true }
[target.'cfg(target_os = "macos")'.dependencies]
core-foundation = "=0.10.1"
[build-dependencies]
cc = "=1.2.4"
[target.'cfg(target_os = "macos")'.build-dependencies]
cc = "=1.2.46"
glob = "=0.3.2"
[lints]