diff options
| author | Hans Bolinder <[email protected]> | 2019-06-03 14:31:04 +0200 |
|---|---|---|
| committer | Hans Bolinder <[email protected]> | 2019-06-03 14:31:04 +0200 |
| commit | 3c62fb76b0ac56f3cf8d3f8abac20cd34b02e985 (patch) | |
| tree | 609b17ffbc9b78af4d938ed1cdd3d28a3ca01396 /erts/vsn.mk | |
| parent | fbee646c4ff63327512f25eb07be0ede66e55599 (diff) | |
| parent | abbe8d424676a473bcebdf3b97996ac7a5a70f16 (diff) | |
| download | otp-3c62fb76b0ac56f3cf8d3f8abac20cd34b02e985.tar.gz otp-3c62fb76b0ac56f3cf8d3f8abac20cd34b02e985.tar.bz2 otp-3c62fb76b0ac56f3cf8d3f8abac20cd34b02e985.zip | |
Merge branch 'maint-22' into maint
* maint-22:
Updated OTP version
Prepare release
# Conflicts:
# make/otp_version_tickets
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 224570fb09..4d8282bf15 100644 --- a/erts/vsn.mk +++ b/erts/vsn.mk @@ -18,7 +18,7 @@ # %CopyrightEnd% # -VSN = 10.4 +VSN = 10.4.1 # Port number 4365 in 4.2 # Port number 4366 in 4.3 |