summaryrefslogtreecommitdiff
path: root/make/otp_version_tickets_in_merge
diff options
context:
space:
mode:
authorIngela Anderton Andin <ingela@erlang.org>2022-06-09 10:02:46 +0200
committerIngela Anderton Andin <ingela@erlang.org>2022-06-09 10:02:46 +0200
commit628a6e3fa5bff69429bd88a200b5bda8ae5a95e6 (patch)
treee9bb2a2c0ec95ddadb138e4ce1a099cff951b1bb /make/otp_version_tickets_in_merge
parentfb11dde7a77863322c507d1f8b3d810e0806a97f (diff)
parentcf18f250a40f33cc648d869eac833cd9aee86ed6 (diff)
downloaderlang-628a6e3fa5bff69429bd88a200b5bda8ae5a95e6.tar.gz
Merge branch 'maint-25' into maint
* maint-25: Updated OTP version Prepare release Update copyright year
Diffstat (limited to 'make/otp_version_tickets_in_merge')
-rw-r--r--make/otp_version_tickets_in_merge17
1 files changed, 17 insertions, 0 deletions
diff --git a/make/otp_version_tickets_in_merge b/make/otp_version_tickets_in_merge
index e69de29bb2..7fc681e49f 100644
--- a/make/otp_version_tickets_in_merge
+++ b/make/otp_version_tickets_in_merge
@@ -0,0 +1,17 @@
+OTP-18010
+OTP-18046
+OTP-18087
+OTP-18094
+OTP-18100
+OTP-18105
+OTP-18106
+OTP-18110
+OTP-18112
+OTP-18120
+OTP-18122
+OTP-18123
+OTP-18124
+OTP-18128
+OTP-18129
+OTP-18132
+OTP-18136