aboutsummaryrefslogtreecommitdiff
path: root/docs/breaking_changes.md
diff options
context:
space:
mode:
Diffstat (limited to 'docs/breaking_changes.md')
-rw-r--r--docs/breaking_changes.md15
1 files changed, 8 insertions, 7 deletions
diff --git a/docs/breaking_changes.md b/docs/breaking_changes.md
index 0503789cd..3e85a7076 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 May 29](ChangeLog/20210529.md)
9* [2021 Feb 27](ChangeLog/20210227.md) 10* [2021 Feb 27](ChangeLog/20210227.md)
10* [2020 Nov 28](ChangeLog/20201128.md) 11* [2020 Nov 28](ChangeLog/20201128.md)
11* [2020 Aug 29](ChangeLog/20200829.md) 12* [2020 Aug 29](ChangeLog/20200829.md)
@@ -15,16 +16,16 @@ The breaking change period is when we will merge PR's that change QMK in dangero
15 16
16## When is the next Breaking Change? 17## When is the next Breaking Change?
17 18
18The next Breaking Change is scheduled for May 29, 2021. 19The next Breaking Change is scheduled for August 28, 2021.
19 20
20### Important Dates 21### Important Dates
21 22
22* [x] 2021 Feb 27 - `develop` is created. Each push to `master` is subsequently merged to `develop` 23* [x] 2021 May 29 - `develop` is created. Each push to `master` is subsequently merged to `develop`
23* [ ] 2021 May 01 - `develop` closed to new PR's. 24* [ ] 2021 Jul 31 - `develop` closed to new PR's.
24* [ ] 2021 May 01 - Call for testers. 25* [ ] 2021 Jul 31 - Call for testers.
25* [ ] 2021 May 27 - `master` is locked, no PR's merged. 26* [ ] 2021 Aug 26 - `master` is locked, no PR's merged.
26* [ ] 2021 May 29 - Merge `develop` to `master`. 27* [ ] 2021 Aug 28 - Merge `develop` to `master`.
27* [ ] 2021 May 29 - `master` is unlocked. PR's can be merged again. 28* [ ] 2021 Aug 28 - `master` is unlocked. PR's can be merged again.
28 29
29## What changes will be included? 30## What changes will be included?
30 31