diff options
| author | John Högberg <[email protected]> | 2019-06-13 10:28:55 +0200 |
|---|---|---|
| committer | John Högberg <[email protected]> | 2019-06-13 10:28:55 +0200 |
| commit | 8fb03c024165d6777f429e495af676dfe020e78a (patch) | |
| tree | f536bfadf844d2dcd0c6bd14a361c0e09b1ca305 /make/otp_version_tickets_in_merge | |
| parent | 898b9b35f2cad1e925ea658d2dc381c5bde01829 (diff) | |
| parent | b4fb2e5669acb02697d9a9ab168eb0fbff6f370c (diff) | |
| download | otp-8fb03c024165d6777f429e495af676dfe020e78a.tar.gz otp-8fb03c024165d6777f429e495af676dfe020e78a.tar.bz2 otp-8fb03c024165d6777f429e495af676dfe020e78a.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 | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/make/otp_version_tickets_in_merge b/make/otp_version_tickets_in_merge index e69de29bb2..e071f1a430 100644 --- a/make/otp_version_tickets_in_merge +++ b/make/otp_version_tickets_in_merge @@ -0,0 +1,9 @@ +OTP-15844 +OTP-15861 +OTP-15862 +OTP-15864 +OTP-15865 +OTP-15871 +OTP-15872 +OTP-15873 +OTP-15875 |