diff options
| author | John Högberg <john@erlang.org> | 2020-01-20 12:31:30 +0100 |
|---|---|---|
| committer | John Högberg <john@erlang.org> | 2020-01-20 12:31:30 +0100 |
| commit | 163ec9efa5d901d7fb9bd0d3873a76c49a6e9e6a (patch) | |
| tree | 925967461bd8f24a50aadce383d6e0334b5a4ab3 /make | |
| parent | be4d4587b2513b377f75dc19f94f270d04c608f8 (diff) | |
| parent | 33feb560af990dffdc138172741b16d7cac9bcb5 (diff) | |
| download | erlang-163ec9efa5d901d7fb9bd0d3873a76c49a6e9e6a.tar.gz | |
Merge branch 'maint-22' into maint
* maint-22:
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, 3 insertions, 0 deletions
diff --git a/make/otp_version_tickets_in_merge b/make/otp_version_tickets_in_merge index e69de29bb2..2b902cc127 100644 --- a/make/otp_version_tickets_in_merge +++ b/make/otp_version_tickets_in_merge @@ -0,0 +1,3 @@ +OTP-16385 +OTP-16388 +OTP-16396 |