aboutsummaryrefslogtreecommitdiffstats
path: root/erts/vsn.mk
diff options
context:
space:
mode:
authorRickard Green <[email protected]>2019-03-06 17:03:03 +0100
committerRickard Green <[email protected]>2019-03-06 17:03:03 +0100
commit933e1671a99958540666781082188f7335fb2823 (patch)
treedf022e81837a78d7a7da3843be293aa87fb6aaa7 /erts/vsn.mk
parent5575fb4d3ced54d6ed8a0afababccb1fe78c77c0 (diff)
parent0ec68a93247ca0ea1d44a2465767dffa4450411a (diff)
downloadotp-933e1671a99958540666781082188f7335fb2823.tar.gz
otp-933e1671a99958540666781082188f7335fb2823.tar.bz2
otp-933e1671a99958540666781082188f7335fb2823.zip
Merge branch 'maint-21' into maint
* maint-21: Updated OTP version Prepare release
Diffstat (limited to 'erts/vsn.mk')
-rw-r--r--erts/vsn.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/vsn.mk b/erts/vsn.mk
index e4bdb1a8eb..bab5c805eb 100644
--- a/erts/vsn.mk
+++ b/erts/vsn.mk
@@ -18,7 +18,7 @@
# %CopyrightEnd%
#
-VSN = 10.2.4
+VSN = 10.2.5
# Port number 4365 in 4.2
# Port number 4366 in 4.3