diff options
| author | Rickard Green <[email protected]> | 2019-03-22 00:32:24 +0100 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2019-03-22 00:32:24 +0100 |
| commit | 6b563c556828b40623967430cfdb0ad99d70ad69 (patch) | |
| tree | ada18abf998762251fab4c8495ac0cb4de3e72df /make | |
| parent | 9e9e1ea0d55b35c7094fd6af26484df7b7cb83e3 (diff) | |
| parent | 7e6fff1e849998a3dd747b4d3cf35f39cb896aa0 (diff) | |
| download | otp-6b563c556828b40623967430cfdb0ad99d70ad69.tar.gz otp-6b563c556828b40623967430cfdb0ad99d70ad69.tar.bz2 otp-6b563c556828b40623967430cfdb0ad99d70ad69.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, 4 insertions, 3 deletions
diff --git a/make/otp_version_tickets_in_merge b/make/otp_version_tickets_in_merge index cfd555fd49..3207292920 100644 --- a/make/otp_version_tickets_in_merge +++ b/make/otp_version_tickets_in_merge @@ -1,3 +1,4 @@ -OTP-14701 -OTP-15676 -OTP-15679 +OTP-15684 +OTP-15685 +OTP-15688 +OTP-15690 |