diff options
| author | Hans Nilsson <hans@erlang.org> | 2021-11-22 09:33:41 +0100 |
|---|---|---|
| committer | Hans Nilsson <hans@erlang.org> | 2021-11-22 09:33:41 +0100 |
| commit | afbed9bbe8940df5c269d62c88e2300114d63f17 (patch) | |
| tree | 63b2f4b7ef7c5dd0c25c9ebabc91fe3b1c528da5 /make | |
| parent | 0be99f3602bdbd00773f90133bb16ef0d1ea06ef (diff) | |
| parent | 5d0fa9d31812947479eb29f797990da6655d4fa2 (diff) | |
| download | erlang-afbed9bbe8940df5c269d62c88e2300114d63f17.tar.gz | |
Merge branch 'maint-24' into maint
* maint-24:
Updated OTP version
Prepare release
# Conflicts:
# make/otp_version_tickets
Diffstat (limited to 'make')
| -rw-r--r-- | make/otp_version_tickets_in_merge | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/make/otp_version_tickets_in_merge b/make/otp_version_tickets_in_merge index 9bece18ada..03a6d79472 100644 --- a/make/otp_version_tickets_in_merge +++ b/make/otp_version_tickets_in_merge @@ -1,2 +1 @@ -OTP-17756 -OTP-17757 +OTP-17764 |