summaryrefslogtreecommitdiff
path: root/make
diff options
context:
space:
mode:
authorHans Nilsson <hans@erlang.org>2022-01-26 10:03:38 +0100
committerHans Nilsson <hans@erlang.org>2022-01-26 10:03:38 +0100
commite5062598fd2e9a4d371403b5345e4087556def2b (patch)
tree3a988886798c47b9a8077870bd906ea40f0647f4 /make
parent7601813ebd0089edb39b629ad76aa479ef3b0b0e (diff)
parent47375b6e71507c3f716168e07cbd75259d5ad6b4 (diff)
downloaderlang-e5062598fd2e9a4d371403b5345e4087556def2b.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_merge6
1 files changed, 0 insertions, 6 deletions
diff --git a/make/otp_version_tickets_in_merge b/make/otp_version_tickets_in_merge
index 18ac1d3359..e69de29bb2 100644
--- a/make/otp_version_tickets_in_merge
+++ b/make/otp_version_tickets_in_merge
@@ -1,6 +0,0 @@
-OTP-17794
-OTP-17827
-OTP-17829
-OTP-17831
-OTP-17871
-OTP-17879