diff options
| author | Rickard Green <[email protected]> | 2019-03-21 20:46:30 +0100 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2019-03-21 20:46:30 +0100 |
| commit | db4eefa49350bb18089f80e21464865f641b614f (patch) | |
| tree | 91d364eedc18c31122f9f424d1d39c9bfb338be1 /make | |
| parent | f5c90a31ebd6e9f09588f176ea6895406d1f7d92 (diff) | |
| parent | 7e6fff1e849998a3dd747b4d3cf35f39cb896aa0 (diff) | |
| download | otp-db4eefa49350bb18089f80e21464865f641b614f.tar.gz otp-db4eefa49350bb18089f80e21464865f641b614f.tar.bz2 otp-db4eefa49350bb18089f80e21464865f641b614f.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 |