aboutsummaryrefslogtreecommitdiffstats
path: root/OTP_VERSION
diff options
context:
space:
mode:
authorHenrik <[email protected]>2018-03-14 09:58:15 +0100
committerHenrik <[email protected]>2018-03-14 09:58:15 +0100
commit388b24ea7327ce8c7267b48c3a464ce8c404ddd6 (patch)
treee2d32963f888c4f358e7b020db65a3d591e360ed /OTP_VERSION
parentc5005dc4f7381bb569c8f27aa7d3d264c4e41ce0 (diff)
parenta113f6117fd696ea6f84ed754055b4ec97a7ccb2 (diff)
downloadotp-388b24ea7327ce8c7267b48c3a464ce8c404ddd6.tar.gz
otp-388b24ea7327ce8c7267b48c3a464ce8c404ddd6.tar.bz2
otp-388b24ea7327ce8c7267b48c3a464ce8c404ddd6.zip
Merge branch 'maint'
Conflicts: OTP_VERSION
Diffstat (limited to 'OTP_VERSION')
-rw-r--r--OTP_VERSION1
1 files changed, 1 insertions, 0 deletions
diff --git a/OTP_VERSION b/OTP_VERSION
index 06d4ac2bfd..a56f451a4e 100644
--- a/OTP_VERSION
+++ b/OTP_VERSION
@@ -1 +1,2 @@
21.0-rc0
+