summaryrefslogtreecommitdiff
path: root/make
diff options
context:
space:
mode:
authorJohn Högberg <john@erlang.org>2022-01-25 17:48:53 +0100
committerJohn Högberg <john@erlang.org>2022-01-25 17:48:53 +0100
commit7601813ebd0089edb39b629ad76aa479ef3b0b0e (patch)
tree4e63d07bdd7fe671f1b639d30e9dd8d8fc8ee59e /make
parent6f18c8588a89556767d0c763f8cc96aaf04758b4 (diff)
parent7bf7f01683acf9b8f09bd8c7331854a9abc17f7d (diff)
downloaderlang-7601813ebd0089edb39b629ad76aa479ef3b0b0e.tar.gz
Merge branch 'maint-24' into maint
* maint-24: Updated OTP version Prepare release Update copyright year
Diffstat (limited to 'make')
-rw-r--r--make/otp_version_tickets_in_merge6
1 files changed, 6 insertions, 0 deletions
diff --git a/make/otp_version_tickets_in_merge b/make/otp_version_tickets_in_merge
index e69de29bb2..18ac1d3359 100644
--- a/make/otp_version_tickets_in_merge
+++ b/make/otp_version_tickets_in_merge
@@ -0,0 +1,6 @@
+OTP-17794
+OTP-17827
+OTP-17829
+OTP-17831
+OTP-17871
+OTP-17879