aboutsummaryrefslogtreecommitdiff
path: root/docs/breaking_changes.md
diff options
context:
space:
mode:
authorNick Brassel <nick@tzarc.org>2021-08-29 08:18:18 +1000
committerGitHub <noreply@github.com>2021-08-29 08:18:18 +1000
commit4bad375d7c09d949a9dcdd4feba147c9c7a67ec6 (patch)
tree33ef1bfb529aed382e8526c607c4e18717f92571 /docs/breaking_changes.md
parent29ec2d8f4283212cf45c926c288f652a6727acb7 (diff)
downloadqmk_firmware-4bad375d7c09d949a9dcdd4feba147c9c7a67ec6.tar.gz
qmk_firmware-4bad375d7c09d949a9dcdd4feba147c9c7a67ec6.zip
2021Q3 pre-merge `develop` changelog, keyboard aliases (#14198)
* Initial changelog. * Data driven. * Submodule update. * Updated breaking changes docs. * Aliases. * Aliases.
Diffstat (limited to 'docs/breaking_changes.md')
-rw-r--r--docs/breaking_changes.md13
1 files changed, 7 insertions, 6 deletions
diff --git a/docs/breaking_changes.md b/docs/breaking_changes.md
index 56a59648c..c5f4eec04 100644
--- a/docs/breaking_changes.md
+++ b/docs/breaking_changes.md
@@ -6,6 +6,7 @@ The breaking change period is when we will merge PR's that change QMK in dangero
6 6
7## What has been included in past Breaking Changes? 7## What has been included in past Breaking Changes?
8 8
9* [2021 Aug 28](ChangeLog/20210828.md)
9* [2021 May 29](ChangeLog/20210529.md) 10* [2021 May 29](ChangeLog/20210529.md)
10* [2021 Feb 27](ChangeLog/20210227.md) 11* [2021 Feb 27](ChangeLog/20210227.md)
11* [2020 Nov 28](ChangeLog/20201128.md) 12* [2020 Nov 28](ChangeLog/20201128.md)
@@ -20,12 +21,12 @@ The next Breaking Change is scheduled for August 28, 2021.
20 21
21### Important Dates 22### Important Dates
22 23
23* [x] 2021 May 29 - `develop` is created. Each push to `master` is subsequently merged to `develop` 24* [x] 2021 Aug 29 - `develop` is created. Each push to `master` is subsequently merged to `develop`
24* [ ] 2021 Jul 31 - `develop` closed to new PR's. 25* [ ] 2021 Oct 31 - `develop` closed to new PR's.
25* [ ] 2021 Jul 31 - Call for testers. 26* [ ] 2021 Oct 31 - Call for testers.
26* [ ] 2021 Aug 26 - `master` is locked, no PR's merged. 27* [ ] 2021 Nov 26 - `master` is locked, no PR's merged.
27* [ ] 2021 Aug 28 - Merge `develop` to `master`. 28* [ ] 2021 Nov 28 - Merge `develop` to `master`.
28* [ ] 2021 Aug 28 - `master` is unlocked. PR's can be merged again. 29* [ ] 2021 Nov 28 - `master` is unlocked. PR's can be merged again.
29 30
30## What changes will be included? 31## What changes will be included?
31 32