diff options
| author | Nick Brassel | 2025-05-26 13:41:49 +0200 |
|---|---|---|
| committer | Nick Brassel | 2025-05-26 13:41:49 +0200 |
| commit | 75a037d2f0f9c54bad8e2f68ae82134559c92f22 (patch) | |
| tree | 2b264de0e7a724c30cca511a9bac7ad29705d1a2 /docs/breaking_changes.md | |
| parent | 28720c4d343a9c5e9f5a62dbd583dbf536a2e61e (diff) | |
| parent | 3703699757b6ce938ff412aca0a8b064927c0cdb (diff) | |
Merge remote-tracking branch 'upstream/develop'
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 a5a57ccd12..9063fc18db 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 ## What has been included in past Breaking Changes? +* [2025 May 25](ChangeLog/20250525) * [2025 Feb 23](ChangeLog/20250223) * [2024 Nov 24](ChangeLog/20241124) -* [2024 Aug 25](ChangeLog/20240825) * [Older Breaking Changes](breaking_changes_history) ## When is the next Breaking Change? -The next Breaking Change is scheduled for May 25, 2025. +The next Breaking Change is scheduled for Aug 31, 2025. ### Important Dates -* 2025 Feb 23 - `develop` is tagged with a new release version. Each push to `master` is subsequently merged to `develop` by GitHub actions. -* 2025 Apr 27 - `develop` closed to new PRs. -* 2025 Apr 27 - Call for testers. -* 2025 May 11 - Last day for merges -- after this point `develop` is locked for testing and accepts only bugfixes -* 2025 May 18 - `develop` is locked, only critical bugfix PRs merged. -* 2025 May 23 - `master` is locked, no PRs merged. -* 2025 May 25 - Merge `develop` to `master`. -* 2025 May 25 - `master` is unlocked. PRs can be merged again. +* 2025 May 25 - `develop` is tagged with a new release version. Each push to `master` is subsequently merged to `develop` by GitHub actions. +* 2025 Aug 3 - `develop` closed to new PRs. +* 2025 Aug 3 - Call for testers. +* 2025 Aug 17 - Last day for merges -- after this point `develop` is locked for testing and accepts only bugfixes +* 2025 Aug 24 - `develop` is locked, only critical bugfix PRs merged. +* 2025 Aug 29 - `master` is locked, no PRs merged. +* 2025 Aug 31 - Merge `develop` to `master`. +* 2025 Aug 31 - `master` is unlocked. PRs can be merged again. ## What changes will be included? |