diff options
| author | Ingela Anderton Andin <ingela@erlang.org> | 2021-02-25 09:46:08 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <ingela@erlang.org> | 2021-02-25 09:46:08 +0100 |
| commit | 65c3686e29d7f435535cbc226432c4d86a11423b (patch) | |
| tree | d3a1e5f8f04a52bf79d724209a93f768bb524b38 /make | |
| parent | e2232d12c04122263dab3e37bb71b4a70779a2a4 (diff) | |
| parent | e8f9f260722457c48a801ba91f087cd986376fcd (diff) | |
| download | erlang-65c3686e29d7f435535cbc226432c4d86a11423b.tar.gz | |
Merge branch 'maint-23' into maint
* maint-23:
Updated OTP version
Prepare release
# Conflicts:
# make/otp_version_tickets
Diffstat (limited to 'make')
| -rw-r--r-- | make/otp_version_tickets_in_merge | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/make/otp_version_tickets_in_merge b/make/otp_version_tickets_in_merge index e69de29bb2..51f2c607f7 100644 --- a/make/otp_version_tickets_in_merge +++ b/make/otp_version_tickets_in_merge @@ -0,0 +1,4 @@ +OTP-16607 +OTP-17173 +OTP-17205 +OTP-17220 |