aboutsummaryrefslogtreecommitdiffstats
path: root/erts
diff options
context:
space:
mode:
authorErlang/OTP <[email protected]>2017-10-25 08:07:41 +0200
committerErlang/OTP <[email protected]>2017-10-25 08:07:41 +0200
commit220858e70fdb0a03ee6d92bef97d749f71a6deca (patch)
tree194c797439df38fc2b2ca32a5fcb0129bee5a9ea /erts
parentac52a2e341f73ae26b03947cf18a7e7e0f396917 (diff)
parent67f7217427d2465eb72e5cd61a6fb1ff8dc55f14 (diff)
downloadotp-220858e70fdb0a03ee6d92bef97d749f71a6deca.tar.gz
otp-220858e70fdb0a03ee6d92bef97d749f71a6deca.tar.bz2
otp-220858e70fdb0a03ee6d92bef97d749f71a6deca.zip
Merge branch 'anders/diameter/decode/OTP-14684' into maint-20
* anders/diameter/decode/OTP-14684: vsn -> 2.1.2 Update appup for ERIERL-14684
Diffstat (limited to 'erts')
0 files changed, 0 insertions, 0 deletions