aboutsummaryrefslogtreecommitdiffstats
path: root/erts/test
diff options
context:
space:
mode:
authorRaimo Niskanen <[email protected]>2019-04-18 13:55:41 +0200
committerRaimo Niskanen <[email protected]>2019-04-18 13:55:41 +0200
commitd0482d868f4662ebebeb115878ea1f99da69f062 (patch)
tree2955c9be9e100e0c5b458f99bf37a17a1ddd8a74 /erts/test
parent9764c554546e6edbbf1b3ddbf68298f8f8fdec82 (diff)
parent3694a010d2c5ec63f97405519f4b728eea1f902b (diff)
downloadotp-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/test')
0 files changed, 0 insertions, 0 deletions