Browse Source

Change master to main (#220)

pull/222/head
Vince Grassia 2 years ago committed by GitHub
parent
commit
7596100146
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 6
      LICENSE.txt
  2. 2
      LICENSE_BITWARDEN.txt
  3. 2
      lint-workflow/tests/fixtures/test_a.yaml

6
LICENSE.txt

@ -5,13 +5,13 @@ specifies another license. Bitwarden Licensed code is found only in the @@ -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
LICENSE_BITWARDEN.txt

@ -56,7 +56,7 @@ such Open Source Software only. @@ -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

2
lint-workflow/tests/fixtures/test_a.yaml vendored

@ -7,7 +7,7 @@ on: @@ -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

Loading…
Cancel
Save