diff options
| author | David Lord <davidism@gmail.com> | 2021-05-11 15:52:53 -0700 |
|---|---|---|
| committer | David Lord <davidism@gmail.com> | 2021-05-11 15:52:53 -0700 |
| commit | a4dae9c70f27f88f3817569ee5bcf81a5b1f6113 (patch) | |
| tree | 45815345ef8f0817772faff2e6ac98e8656a78cf | |
| parent | 51a72c67eff17964ed02d266e37dcf1824c07281 (diff) | |
| parent | 4f54e0ea0670309e88ce717c0e4a6794f9bd7b3b (diff) | |
| download | markupsafe-a4dae9c70f27f88f3817569ee5bcf81a5b1f6113.tar.gz | |
Merge remote-tracking branch 'origin/2.0.x'
| -rw-r--r-- | .github/workflows/build.yaml | 2 | ||||
| -rw-r--r-- | .github/workflows/tests.yaml | 4 | ||||
| -rw-r--r-- | CONTRIBUTING.rst | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index d660587..5efae06 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -2,7 +2,7 @@ name: Build on: push: branches: - - master + - main - '*.x' tags: - '*' diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index d52088f..b00a866 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -2,7 +2,7 @@ name: Tests on: push: branches: - - master + - main - '*.x' paths-ignore: - 'docs/**' @@ -10,7 +10,7 @@ on: - '*.rst' pull_request: branches: - - master + - main - '*.x' paths-ignore: - 'docs/**' diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index 49f91de..c58ad8c 100644 --- a/CONTRIBUTING.rst +++ b/CONTRIBUTING.rst @@ -141,12 +141,12 @@ Start coding $ git checkout -b your-branch-name origin/1.0.x If you're submitting a feature addition or change, branch off of the - "master" branch. + "main" branch. .. code-block:: text $ git fetch origin - $ git checkout -b your-branch-name origin/master + $ git checkout -b your-branch-name origin/main - Using your favorite editor, make your changes, `committing as you go`_. |