diff options
Diffstat (limited to 'docs/breaking_changes.md')
| -rw-r--r-- | docs/breaking_changes.md | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/docs/breaking_changes.md b/docs/breaking_changes.md index b60118cd64..1c0b1bafce 100644 --- a/docs/breaking_changes.md +++ b/docs/breaking_changes.md | |||
| @@ -10,25 +10,25 @@ Practically, this means QMK merges the `develop` branch into the `master` branch | |||
| 10 | 10 | ||
| 11 | ## What has been included in past Breaking Changes? | 11 | ## What has been included in past Breaking Changes? |
| 12 | 12 | ||
| 13 | * [2024 May 26](ChangeLog/20240526.md) | ||
| 13 | * [2024 Feb 25](ChangeLog/20240225.md) | 14 | * [2024 Feb 25](ChangeLog/20240225.md) |
| 14 | * [2023 Nov 26](ChangeLog/20231126.md) | 15 | * [2023 Nov 26](ChangeLog/20231126.md) |
| 15 | * [2023 Aug 27](ChangeLog/20230827.md) | ||
| 16 | * [Older Breaking Changes](breaking_changes_history.md) | 16 | * [Older Breaking Changes](breaking_changes_history.md) |
| 17 | 17 | ||
| 18 | ## When is the next Breaking Change? | 18 | ## When is the next Breaking Change? |
| 19 | 19 | ||
| 20 | The next Breaking Change is scheduled for May 26, 2024. | 20 | The next Breaking Change is scheduled for August 25, 2024. |
| 21 | 21 | ||
| 22 | ### Important Dates | 22 | ### Important Dates |
| 23 | 23 | ||
| 24 | * 2024 Feb 25 - `develop` is tagged with a new release version. Each push to `master` is subsequently merged to `develop` by GitHub actions. | 24 | * 2024 May 26 - `develop` is tagged with a new release version. Each push to `master` is subsequently merged to `develop` by GitHub actions. |
| 25 | * 2024 Apr 28 - `develop` closed to new PRs. | 25 | * 2024 Jul 28 - `develop` closed to new PRs. |
| 26 | * 2024 Apr 28 - Call for testers. | 26 | * 2024 Jul 28 - Call for testers. |
| 27 | * 2024 May 5 - Last day for merges -- after this point `develop` is locked for testing and accepts only bugfixes | 27 | * 2024 Aug 4 - Last day for merges -- after this point `develop` is locked for testing and accepts only bugfixes |
| 28 | * 2024 May 19 - `develop` is locked, only critical bugfix PRs merged. | 28 | * 2024 Aug 18 - `develop` is locked, only critical bugfix PRs merged. |
| 29 | * 2024 May 23 - `master` is locked, no PRs merged. | 29 | * 2024 Aug 22 - `master` is locked, no PRs merged. |
| 30 | * 2024 May 26 - Merge `develop` to `master`. | 30 | * 2024 Aug 25 - Merge `develop` to `master`. |
| 31 | * 2024 May 26 - `master` is unlocked. PRs can be merged again. | 31 | * 2024 Aug 25 - `master` is unlocked. PRs can be merged again. |
| 32 | 32 | ||
| 33 | ## What changes will be included? | 33 | ## What changes will be included? |
| 34 | 34 | ||
