diff options
| author | John Högberg <[email protected]> | 2019-07-10 10:11:17 +0200 |
|---|---|---|
| committer | John Högberg <[email protected]> | 2019-07-10 10:11:17 +0200 |
| commit | 4e9792256a754ff10f6a214f582fbb58e081deb2 (patch) | |
| tree | b9648e94ed7214ba2ed548664bc18eb8f4ff7027 /make/otp_version_tickets_in_merge | |
| parent | bf93aa02d98c8d4448b271cac88d6e6b3455f166 (diff) | |
| parent | fa5e2cae48323a391ff65512a972d6c9f4ba4119 (diff) | |
| download | otp-4e9792256a754ff10f6a214f582fbb58e081deb2.tar.gz otp-4e9792256a754ff10f6a214f582fbb58e081deb2.tar.bz2 otp-4e9792256a754ff10f6a214f582fbb58e081deb2.zip | |
Merge branch 'maint-22' into maint
* maint-22:
Updated OTP version
Prepare release
# Conflicts:
# make/otp_version_tickets
Diffstat (limited to 'make/otp_version_tickets_in_merge')
| -rw-r--r-- | make/otp_version_tickets_in_merge | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/make/otp_version_tickets_in_merge b/make/otp_version_tickets_in_merge index b741526c88..c3caa074a3 100644 --- a/make/otp_version_tickets_in_merge +++ b/make/otp_version_tickets_in_merge @@ -1,10 +1,5 @@ -OTP-15900 -OTP-15908 -OTP-15909 -OTP-15910 -OTP-15913 -OTP-15922 -OTP-15930 -OTP-15938 -OTP-15939 -OTP-15941 +OTP-15943 +OTP-15945 +OTP-15946 +OTP-15949 +OTP-15952 |