diff options
| author | Sverker Eriksson <[email protected]> | 2019-04-01 15:21:50 +0200 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2019-04-01 15:21:50 +0200 |
| commit | abc64999241276879208d077f9d94101366a414e (patch) | |
| tree | c2e4e776415cf972508ae3e8beadbb3b677ecd80 /make | |
| parent | 97bd138d220bcb863a7e09dd420f879137c09a6c (diff) | |
| parent | 1feae54b6a313f7a35ca1671e3c50f8b434a1bb0 (diff) | |
| download | otp-abc64999241276879208d077f9d94101366a414e.tar.gz otp-abc64999241276879208d077f9d94101366a414e.tar.bz2 otp-abc64999241276879208d077f9d94101366a414e.zip | |
Merge branch 'maint-21' into maint
* maint-21:
Updated OTP version
Prepare release
# Conflicts:
# make/otp_version_tickets
Diffstat (limited to 'make')
| -rw-r--r-- | make/otp_version_tickets_in_merge | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/make/otp_version_tickets_in_merge b/make/otp_version_tickets_in_merge index 3207292920..a7a96d733b 100644 --- a/make/otp_version_tickets_in_merge +++ b/make/otp_version_tickets_in_merge @@ -1,4 +1,3 @@ -OTP-15684 -OTP-15685 -OTP-15688 -OTP-15690 +OTP-15704 +OTP-15706 +OTP-15709 |