summaryrefslogtreecommitdiff
path: root/make/otp_version_tickets_in_merge
diff options
context:
space:
mode:
authorIngela Anderton Andin <ingela@erlang.org>2022-03-15 15:11:33 +0100
committerIngela Anderton Andin <ingela@erlang.org>2022-03-15 15:11:33 +0100
commit49771f92a4ee47074486ef3faa075976f6ced654 (patch)
treed3a7ae395b4d5e113b4e7def8a32e8e5f63e036d /make/otp_version_tickets_in_merge
parent382ca5bec172f4c6eb091792d981f2e32313ae15 (diff)
parent0989706ac7ceb8236efc1e3c6eb1deff8c984645 (diff)
downloaderlang-49771f92a4ee47074486ef3faa075976f6ced654.tar.gz
Merge branch 'maint-24' into maint
* maint-24: Updated OTP version Prepare release
Diffstat (limited to 'make/otp_version_tickets_in_merge')
-rw-r--r--make/otp_version_tickets_in_merge4
1 files changed, 2 insertions, 2 deletions
diff --git a/make/otp_version_tickets_in_merge b/make/otp_version_tickets_in_merge
index 295f43e3ce..43e85546a2 100644
--- a/make/otp_version_tickets_in_merge
+++ b/make/otp_version_tickets_in_merge
@@ -1,2 +1,2 @@
-OTP-17850
-OTP-17922
+OTP-17963
+OTP-17971