diff options
| author | John Högberg <[email protected]> | 2019-07-11 11:24:19 +0200 |
|---|---|---|
| committer | John Högberg <[email protected]> | 2019-07-11 11:24:19 +0200 |
| commit | 220eeb3670e536b55c8e6812de86481cedd83bfe (patch) | |
| tree | 1501c318f6b2e4b48c6d1154d2b6a0a64e77b7c1 /make/otp_version_tickets_in_merge | |
| parent | d2c096de3c677c20d4a149bec6a9346aea9ccf4d (diff) | |
| parent | 3967d28c05dae77db30b15e56eb4ececf4f1afef (diff) | |
| download | otp-220eeb3670e536b55c8e6812de86481cedd83bfe.tar.gz otp-220eeb3670e536b55c8e6812de86481cedd83bfe.tar.bz2 otp-220eeb3670e536b55c8e6812de86481cedd83bfe.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 | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/make/otp_version_tickets_in_merge b/make/otp_version_tickets_in_merge index c3caa074a3..9d97677ff4 100644 --- a/make/otp_version_tickets_in_merge +++ b/make/otp_version_tickets_in_merge @@ -1,5 +1 @@ -OTP-15943 -OTP-15945 -OTP-15946 -OTP-15949 -OTP-15952 +OTP-15953 |