diff options
author | Raimo Niskanen <[email protected]> | 2019-04-18 13:55:41 +0200 |
---|---|---|
committer | Raimo Niskanen <[email protected]> | 2019-04-18 13:55:41 +0200 |
commit | d0482d868f4662ebebeb115878ea1f99da69f062 (patch) | |
tree | 2955c9be9e100e0c5b458f99bf37a17a1ddd8a74 /erts/preloaded/src/erl_init.erl | |
parent | 9764c554546e6edbbf1b3ddbf68298f8f8fdec82 (diff) | |
parent | 3694a010d2c5ec63f97405519f4b728eea1f902b (diff) | |
download | otp-d0482d868f4662ebebeb115878ea1f99da69f062.tar.gz otp-d0482d868f4662ebebeb115878ea1f99da69f062.tar.bz2 otp-d0482d868f4662ebebeb115878ea1f99da69f062.zip |
Merge branch 'maint'
* maint:
Updated OTP version
Prepare release
Conflicts:
OTP_VERSION
Diffstat (limited to 'erts/preloaded/src/erl_init.erl')
0 files changed, 0 insertions, 0 deletions