aboutsummaryrefslogtreecommitdiffstats
path: root/make
diff options
context:
space:
mode:
authorAnders Svensson <[email protected]>2019-02-14 12:48:20 +0100
committerAnders Svensson <[email protected]>2019-02-14 12:48:20 +0100
commitf45efdd2663b8050edb4351a8d1d57d437fb6e51 (patch)
tree2a53230f5878767484969006bfbfbc0bcf450134 /make
parent21988f3d212778124565038a2b2310925eb6ccc1 (diff)
parent487729f0a064d32a3fea6ad092f59a60ee53ca5f (diff)
downloadotp-f45efdd2663b8050edb4351a8d1d57d437fb6e51.tar.gz
otp-f45efdd2663b8050edb4351a8d1d57d437fb6e51.tar.bz2
otp-f45efdd2663b8050edb4351a8d1d57d437fb6e51.zip
Merge branch 'maint-20' into maint
* maint-20: Updated OTP version Prepare release
Diffstat (limited to 'make')
-rw-r--r--make/otp_version_tickets_in_merge1
1 files changed, 0 insertions, 1 deletions
diff --git a/make/otp_version_tickets_in_merge b/make/otp_version_tickets_in_merge
index 921f8b53fe..e69de29bb2 100644
--- a/make/otp_version_tickets_in_merge
+++ b/make/otp_version_tickets_in_merge
@@ -1 +0,0 @@
-OTP-15554