diff options
author | John Högberg <[email protected]> | 2018-07-26 09:56:21 +0200 |
---|---|---|
committer | John Högberg <[email protected]> | 2018-07-26 09:56:21 +0200 |
commit | a0b2cc0a377d780fe938ba9be3e417c7a8e00914 (patch) | |
tree | 0d5714d31e6c67faeaaab6f76351bf3bec4a8591 /erts/vsn.mk | |
parent | f678e1b71987075cfd7816da7e7dd828ea630115 (diff) | |
parent | 4664de710ded469916fcc8f85d4e9791adc319e9 (diff) | |
download | otp-a0b2cc0a377d780fe938ba9be3e417c7a8e00914.tar.gz otp-a0b2cc0a377d780fe938ba9be3e417c7a8e00914.tar.bz2 otp-a0b2cc0a377d780fe938ba9be3e417c7a8e00914.zip |
Merge branch 'maint-21' into maint
Diffstat (limited to 'erts/vsn.mk')
-rw-r--r-- | erts/vsn.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/vsn.mk b/erts/vsn.mk index 0abb06bdc1..ac464ea165 100644 --- a/erts/vsn.mk +++ b/erts/vsn.mk @@ -18,7 +18,7 @@ # %CopyrightEnd% # -VSN = 10.0.3 +VSN = 10.0.4 # Port number 4365 in 4.2 # Port number 4366 in 4.3 |