summaryrefslogtreecommitdiff
path: root/make
diff options
context:
space:
mode:
authorBjörn Gustavsson <bjorn@erlang.org>2022-10-04 12:09:40 +0200
committerBjörn Gustavsson <bjorn@erlang.org>2022-10-04 12:09:40 +0200
commita00463b9c43f80b671619fddfd0e8d1c594c5b88 (patch)
tree3e9497df347a67d50af927821abbb41ccb512565 /make
parentc11b0d1d7b2a9ed87e2bc501ab2662b456d6ab2d (diff)
parent997952bb727897070ec1a93f10a5bdc5821a0286 (diff)
downloaderlang-a00463b9c43f80b671619fddfd0e8d1c594c5b88.tar.gz
Merge branch 'maint-23' into maint
* maint-23: Updated OTP version Prepare release Update copyright year
Diffstat (limited to 'make')
-rw-r--r--make/otp_version_tickets_in_merge8
1 files changed, 0 insertions, 8 deletions
diff --git a/make/otp_version_tickets_in_merge b/make/otp_version_tickets_in_merge
index 45911e50e7..e69de29bb2 100644
--- a/make/otp_version_tickets_in_merge
+++ b/make/otp_version_tickets_in_merge
@@ -1,8 +0,0 @@
-OTP-18240
-OTP-18245
-OTP-18249
-OTP-18258
-OTP-18262
-OTP-18263
-OTP-18264
-OTP-18266