diff options
author | Henrik <[email protected]> | 2018-03-14 09:58:15 +0100 |
---|---|---|
committer | Henrik <[email protected]> | 2018-03-14 09:58:15 +0100 |
commit | 388b24ea7327ce8c7267b48c3a464ce8c404ddd6 (patch) | |
tree | e2d32963f888c4f358e7b020db65a3d591e360ed /erts/vsn.mk | |
parent | c5005dc4f7381bb569c8f27aa7d3d264c4e41ce0 (diff) | |
parent | a113f6117fd696ea6f84ed754055b4ec97a7ccb2 (diff) | |
download | otp-388b24ea7327ce8c7267b48c3a464ce8c404ddd6.tar.gz otp-388b24ea7327ce8c7267b48c3a464ce8c404ddd6.tar.bz2 otp-388b24ea7327ce8c7267b48c3a464ce8c404ddd6.zip |
Merge branch 'maint'
Conflicts:
OTP_VERSION
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 50b77fdbc0..c3a62a5535 100644 --- a/erts/vsn.mk +++ b/erts/vsn.mk @@ -18,7 +18,7 @@ # %CopyrightEnd% # -VSN = 9.2.1 +VSN = 9.3 # Port number 4365 in 4.2 # Port number 4366 in 4.3 |