diff options
| author | Rickard Green <[email protected]> | 2019-03-19 14:17:44 +0100 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2019-03-19 14:17:44 +0100 |
| commit | ba118afbcd433b545ad0d528dec3b9cda19937c4 (patch) | |
| tree | f0d1cfc7ec3495a1e092fa10a8411f79d817550c /make/otp_version_tickets_in_merge | |
| parent | ef67e6a44cf1c87b8221cb652995b82ea1c9e728 (diff) | |
| parent | a4f71b669ad9ece1a4afa671601c7c72dc89f042 (diff) | |
| download | otp-ba118afbcd433b545ad0d528dec3b9cda19937c4.tar.gz otp-ba118afbcd433b545ad0d528dec3b9cda19937c4.tar.bz2 otp-ba118afbcd433b545ad0d528dec3b9cda19937c4.zip | |
Merge branch 'maint-21' into maint
* maint-21:
Updated OTP version
Prepare release
Diffstat (limited to 'make/otp_version_tickets_in_merge')
| -rw-r--r-- | make/otp_version_tickets_in_merge | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/make/otp_version_tickets_in_merge b/make/otp_version_tickets_in_merge index ff967634a2..cfd555fd49 100644 --- a/make/otp_version_tickets_in_merge +++ b/make/otp_version_tickets_in_merge @@ -1,3 +1,3 @@ -OTP-15551 -OTP-15651 -OTP-15652 +OTP-14701 +OTP-15676 +OTP-15679 |