aboutsummaryrefslogtreecommitdiffstats
path: root/make
diff options
context:
space:
mode:
authorRickard Green <[email protected]>2018-10-11 21:47:38 +0200
committerRickard Green <[email protected]>2018-10-11 21:47:38 +0200
commit6b3d6f4a3d73cae7ff87b10b0aa5be6ff8c0a10a (patch)
treec48539ff13de21ba3feeaac6641d9906c06ceb58 /make
parentb936fe223ffce8dea9804f78a9782b0ce06c4c67 (diff)
parenta5d9e9901468d75a2913c83580d5e9e29f37462d (diff)
downloadotp-6b3d6f4a3d73cae7ff87b10b0aa5be6ff8c0a10a.tar.gz
otp-6b3d6f4a3d73cae7ff87b10b0aa5be6ff8c0a10a.tar.bz2
otp-6b3d6f4a3d73cae7ff87b10b0aa5be6ff8c0a10a.zip
Merge branch 'maint-17' into maint
* maint-17: Updated OTP version Prepare release
Diffstat (limited to 'make')
-rw-r--r--make/otp_version_tickets6
1 files changed, 6 insertions, 0 deletions
diff --git a/make/otp_version_tickets b/make/otp_version_tickets
new file mode 100644
index 0000000000..2f16bfcc99
--- /dev/null
+++ b/make/otp_version_tickets
@@ -0,0 +1,6 @@
+OTP-13424
+OTP-13866
+OTP-13869
+OTP-14159
+OTP-14514
+OTP-14590