Skip to content

Commit

Permalink
Change master to main (#220)
Browse files Browse the repository at this point in the history
  • Loading branch information
vgrassia authored Dec 15, 2023
1 parent 527dfd2 commit 7596100
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions LICENSE.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ specifies another license. Bitwarden Licensed code is found only in the
/bitwarden_license directory.

GPL v3.0:
https://github.com/bitwarden/web/blob/master/LICENSE_GPL.txt
https://github.com/bitwarden/clients/blob/main/LICENSE_GPL.txt

Bitwarden License v1.0:
https://github.com/bitwarden/web/blob/master/LICENSE_BITWARDEN.txt
https://github.com/bitwarden/clients/blob/main/LICENSE_BITWARDEN.txt

No grant of any rights in the trademarks, service marks, or logos of Bitwarden is
made (except as may be necessary to comply with the notice requirements as
applicable), and use of any Bitwarden trademarks must comply with Bitwarden
Trademark Guidelines
<https://github.com/bitwarden/server/blob/master/TRADEMARK_GUIDELINES.md>.
<https://github.com/bitwarden/server/blob/main/TRADEMARK_GUIDELINES.md>.
2 changes: 1 addition & 1 deletion LICENSE_BITWARDEN.txt
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ such Open Source Software only.
logos of any Contributor (except as may be necessary to comply with the notice
requirements in Section 2.3), and use of any Bitwarden trademarks must comply with
Bitwarden Trademark Guidelines
<https://github.com/bitwarden/server/blob/master/TRADEMARK_GUIDELINES.md>.
<https://github.com/bitwarden/server/blob/main/TRADEMARK_GUIDELINES.md>.

3. TERMINATION

Expand Down
2 changes: 1 addition & 1 deletion lint-workflow/tests/fixtures/test_a.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:

jobs:
call-workflow:
uses: bitwarden/server/.github/workflows/workflow-linter.yml@master
uses: bitwarden/server/.github/workflows/workflow-linter.yml@main

test-normal-action:
name: Download Latest
Expand Down

0 comments on commit 7596100

Please sign in to comment.