diff options
| author | John Högberg <[email protected]> | 2019-06-18 10:13:18 +0200 |
|---|---|---|
| committer | John Högberg <[email protected]> | 2019-06-18 10:13:18 +0200 |
| commit | e5b0b72d7213788ae6d4f01be14ba48ac463589d (patch) | |
| tree | 3a2a25a1f87f2d82f32f9a66d9f6efcb15ad2573 /make | |
| parent | 6ba18fda60dbefc790910fc4310125f80a288829 (diff) | |
| parent | 4319a7f8bc93388ec540e954eb9bb73ea1eec4ef (diff) | |
| download | otp-e5b0b72d7213788ae6d4f01be14ba48ac463589d.tar.gz otp-e5b0b72d7213788ae6d4f01be14ba48ac463589d.tar.bz2 otp-e5b0b72d7213788ae6d4f01be14ba48ac463589d.zip | |
Merge branch 'maint-22' into maint
* maint-22:
Updated OTP version
Prepare release
# Conflicts:
# make/otp_version_tickets
Diffstat (limited to 'make')
| -rw-r--r-- | make/otp_version_tickets_in_merge | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/make/otp_version_tickets_in_merge b/make/otp_version_tickets_in_merge index e69de29bb2..fd9b36720a 100644 --- a/make/otp_version_tickets_in_merge +++ b/make/otp_version_tickets_in_merge @@ -0,0 +1,6 @@ +OTP-15805 +OTP-15819 +OTP-15867 +OTP-15879 +OTP-15887 +OTP-15888 |