aboutsummaryrefslogtreecommitdiffstats
path: root/erts
diff options
context:
space:
mode:
authorErlang/OTP <[email protected]>2017-10-09 15:00:09 +0200
committerErlang/OTP <[email protected]>2017-10-09 15:00:09 +0200
commitb3b8793136906b5d6b93706e4f4c8ba12f95b612 (patch)
tree360cb50effa79af7b3dfe556879c3da9c0d8efdd /erts
parent760b3cde56740bd5d4aa5186b59a9b3600f6f7b1 (diff)
parent0330a700879b3ada5a288e62d008b78cb7603fbe (diff)
downloadotp-b3b8793136906b5d6b93706e4f4c8ba12f95b612.tar.gz
otp-b3b8793136906b5d6b93706e4f4c8ba12f95b612.tar.bz2
otp-b3b8793136906b5d6b93706e4f4c8ba12f95b612.zip
Merge branch 'anders/diameter/reg_monitor/OTP-14668' into maint-20
* anders/diameter/reg_monitor/OTP-14668: vsn -> 2.1.1 Update appup and code_change for ERIERL-83
Diffstat (limited to 'erts')
0 files changed, 0 insertions, 0 deletions