diff options
| author | Hans Bolinder <[email protected]> | 2019-06-03 14:31:04 +0200 |
|---|---|---|
| committer | Hans Bolinder <[email protected]> | 2019-06-03 14:31:04 +0200 |
| commit | 3c62fb76b0ac56f3cf8d3f8abac20cd34b02e985 (patch) | |
| tree | 609b17ffbc9b78af4d938ed1cdd3d28a3ca01396 /make/otp_version_tickets_in_merge | |
| parent | fbee646c4ff63327512f25eb07be0ede66e55599 (diff) | |
| parent | abbe8d424676a473bcebdf3b97996ac7a5a70f16 (diff) | |
| download | otp-3c62fb76b0ac56f3cf8d3f8abac20cd34b02e985.tar.gz otp-3c62fb76b0ac56f3cf8d3f8abac20cd34b02e985.tar.bz2 otp-3c62fb76b0ac56f3cf8d3f8abac20cd34b02e985.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 | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/make/otp_version_tickets_in_merge b/make/otp_version_tickets_in_merge index 3728402492..a9ca1cb131 100644 --- a/make/otp_version_tickets_in_merge +++ b/make/otp_version_tickets_in_merge @@ -1,2 +1,11 @@ -OTP-15823 -OTP-15825 +OTP-15828 +OTP-15829 +OTP-15832 +OTP-15834 +OTP-15838 +OTP-15839 +OTP-15841 +OTP-15845 +OTP-15846 +OTP-15847 +OTP-15848 |