1
0
mirror of https://github.com/bitwarden/browser synced 2026-02-13 15:03:26 +00:00

resolve merge conflicts

This commit is contained in:
William Martin
2024-07-25 13:54:06 -04:00
215 changed files with 4255 additions and 10070 deletions

1
.github/CODEOWNERS vendored
View File

@@ -6,6 +6,7 @@
## Secrets Manager team files ##
bitwarden_license/bit-web/src/app/secrets-manager @bitwarden/team-secrets-manager-dev
apps/web/src/app/secrets-manager/ @bitwarden/team-secrets-manager-dev
## Auth team files ##
apps/browser/src/auth @bitwarden/team-auth-dev