diff options
| author | John Högberg <john@erlang.org> | 2019-11-11 06:02:31 +0100 |
|---|---|---|
| committer | John Högberg <john@erlang.org> | 2019-11-11 06:02:31 +0100 |
| commit | 72693de1da91ea6a8c3ee1875c3c6db659825c31 (patch) | |
| tree | 5ec80f567fe2579a5ab8f8dec1f7978ed69e7a95 /make/otp_version_tickets_in_merge | |
| parent | 397753a2a69c77ca17b3bd45b880881bb1d4584a (diff) | |
| parent | 0739760ac6ad4c9b2a92bca04a6e68a0e90528ad (diff) | |
| download | erlang-72693de1da91ea6a8c3ee1875c3c6db659825c31.tar.gz | |
Merge branch 'maint-22' into maint
* maint-22:
Updated OTP version
Prepare release
# Conflicts:
# make/otp_version_tickets
Diffstat (limited to 'make/otp_version_tickets_in_merge')
| -rw-r--r-- | make/otp_version_tickets_in_merge | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/make/otp_version_tickets_in_merge b/make/otp_version_tickets_in_merge index 47b4679641..c18339803e 100644 --- a/make/otp_version_tickets_in_merge +++ b/make/otp_version_tickets_in_merge @@ -1,4 +1,4 @@ -OTP-16219 -OTP-16228 -OTP-16241 -OTP-16242 +OTP-16193 +OTP-16224 +OTP-16259 +OTP-16265 |