From 69c81f25833056a6e5e17a6fd00dec68044df327 Mon Sep 17 00:00:00 2001
From: Robin Malfait
Date: Wed, 7 Aug 2024 17:16:58 +0200
Subject: [PATCH] rename `master` to `main`
---
.github/CONTRIBUTING.md | 2 +-
.github/PULL_REQUEST_TEMPLATE.md | 2 +-
.github/workflows/ci-stable.yml | 4 ++--
.github/workflows/ci.yml | 4 ++--
.github/workflows/integration-tests.yml | 4 ++--
.github/workflows/release-insiders.yml | 2 +-
README.md | 6 +++---
7 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index f1722bf4f..1e37bd39a 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -14,7 +14,7 @@ If you open a pull request for a new feature, we're likely to close it not becau
## Coding standards
-Our code formatting rules are defined in [.eslintrc](https://github.com/tailwindcss/tailwindcss/blob/master/.eslintrc.json). You can check your code against these standards by running:
+Our code formatting rules are defined in [.eslintrc](https://github.com/tailwindcss/tailwindcss/blob/main/.eslintrc.json). You can check your code against these standards by running:
```sh
npm run style
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index ce7fafb97..520c84261 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -6,6 +6,6 @@
It's never a fun experience to have your pull request declined after investing a lot of time and effort into a new feature. To avoid this from happening, we request that contributors create an issue to first discuss any significant new features. This includes things like adding new utilities, creating new at-rules, or adding new component examples to the documentation.
-https://github.com/tailwindcss/tailwindcss/blob/master/.github/CONTRIBUTING.md
+https://github.com/tailwindcss/tailwindcss/blob/main/.github/CONTRIBUTING.md
-->
diff --git a/.github/workflows/ci-stable.yml b/.github/workflows/ci-stable.yml
index 4d3f6025d..394bd6dda 100644
--- a/.github/workflows/ci-stable.yml
+++ b/.github/workflows/ci-stable.yml
@@ -8,9 +8,9 @@ name: CI — Stable
on:
push:
- branches: [master]
+ branches: [main]
pull_request:
- branches: [master, 3.3, 3.4]
+ branches: [main, 3.3, 3.4]
permissions:
contents: read
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a8c22d095..e5c0135fb 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -5,9 +5,9 @@ name: CI — Stable
on:
push:
- branches: [master]
+ branches: [main]
pull_request:
- branches: [master, 3.3, 3.4]
+ branches: [main, 3.3, 3.4]
permissions:
contents: read
diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
index b424f33f1..f0967175c 100644
--- a/.github/workflows/integration-tests.yml
+++ b/.github/workflows/integration-tests.yml
@@ -2,9 +2,9 @@ name: Integration Tests
on:
push:
- branches: [master, 3.3, 3.4]
+ branches: [main, 3.3, 3.4]
pull_request:
- branches: [master, 3.3, 3.4]
+ branches: [main, 3.3, 3.4]
permissions:
contents: read
diff --git a/.github/workflows/release-insiders.yml b/.github/workflows/release-insiders.yml
index 4888e1909..73e880acc 100644
--- a/.github/workflows/release-insiders.yml
+++ b/.github/workflows/release-insiders.yml
@@ -2,7 +2,7 @@ name: Release Insiders
on:
push:
- branches: [master]
+ branches: [main]
permissions:
contents: read
diff --git a/README.md b/README.md
index 19388f019..14c29a3c0 100644
--- a/README.md
+++ b/README.md
@@ -13,10 +13,10 @@
-
+
-
+
---
@@ -37,4 +37,4 @@ For casual chit-chat with others using the framework:
## Contributing
-If you're interested in contributing to Tailwind CSS, please read our [contributing docs](https://github.com/tailwindcss/tailwindcss/blob/master/.github/CONTRIBUTING.md) **before submitting a pull request**.
+If you're interested in contributing to Tailwind CSS, please read our [contributing docs](https://github.com/tailwindcss/tailwindcss/blob/main/.github/CONTRIBUTING.md) **before submitting a pull request**.