Merge remote-tracking branch 'upstream/master' into vitepress

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?
 
+* [2024 May 26](ChangeLog/20240526)
 * [2024 Feb 25](ChangeLog/20240225)
 * [2023 Nov 26](ChangeLog/20231126)
-* [2023 Aug 27](ChangeLog/20230827)
 * [Older Breaking Changes](breaking_changes_history)
 
 ## When is the next Breaking Change?
 
-The next Breaking Change is scheduled for May 26, 2024.
+The next Breaking Change is scheduled for August 25, 2024.
 
 ### Important Dates
 
-* 2024 Feb 25 - `develop` is tagged with a new release version. Each push to `master` is subsequently merged to `develop` by GitHub actions.
-* 2024 Apr 28 - `develop` closed to new PRs.
-* 2024 Apr 28 - Call for testers.
-* 2024 May 5 - Last day for merges -- after this point `develop` is locked for testing and accepts only bugfixes
-* 2024 May 19 - `develop` is locked, only critical bugfix PRs merged.
-* 2024 May 23 - `master` is locked, no PRs merged.
-* 2024 May 26 - Merge `develop` to `master`.
-* 2024 May 26 - `master` is unlocked. PRs can be merged again.
+* 2024 May 26 - `develop` is tagged with a new release version. Each push to `master` is subsequently merged to `develop` by GitHub actions.
+* 2024 Jul 28 - `develop` closed to new PRs.
+* 2024 Jul 28 - Call for testers.
+* 2024 Aug 4 - Last day for merges -- after this point `develop` is locked for testing and accepts only bugfixes
+* 2024 Aug 18 - `develop` is locked, only critical bugfix PRs merged.
+* 2024 Aug 22 - `master` is locked, no PRs merged.
+* 2024 Aug 25 - Merge `develop` to `master`.
+* 2024 Aug 25 - `master` is unlocked. PRs can be merged again.
 
 ## What changes will be included?
 

docs/breaking_changes_history.md

@@ -2,6 +2,7 @@
 
 This page links to all previous changelogs from the QMK Breaking Changes process.
 
+* [2024 May 26](ChangeLog/20240526) - version 0.25.0
 * [2024 Feb 25](ChangeLog/20240225) - version 0.24.0
 * [2023 Nov 26](ChangeLog/20231126) - version 0.23.0
 * [2023 Aug 27](ChangeLog/20230827) - version 0.22.0

readme.md

@@ -1,7 +1,3 @@
-# THIS IS THE DEVELOP BRANCH
-
-Warning- This is the `develop` branch of QMK Firmware. You may encounter broken code here. Please see [Breaking Changes](https://docs.qmk.fm/#/breaking_changes) for more information.
-
 # Quantum Mechanical Keyboard Firmware
 
 [![Current Version](https://img.shields.io/github/tag/qmk/qmk_firmware.svg)](https://github.com/qmk/qmk_firmware/tags)