aboutsummaryrefslogtreecommitdiffstats
path: root/erts
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2015-02-19 09:50:31 +0100
committerIngela Anderton Andin <[email protected]>2015-02-19 09:50:31 +0100
commit9e3299ca1b5d70562372a8eb51abf1cd96a284db (patch)
tree39091fb509da19663dc383a426ce6a8794291b70 /erts
parentf473c64efaf61cb89b35934725e14b5a026f264c (diff)
parent8ac0c3490a79dda2f6d9633af2f13e169f2084ea (diff)
downloadotp-9e3299ca1b5d70562372a8eb51abf1cd96a284db.tar.gz
otp-9e3299ca1b5d70562372a8eb51abf1cd96a284db.tar.bz2
otp-9e3299ca1b5d70562372a8eb51abf1cd96a284db.zip
Merge branch 'ia/ssl/delete-vs-remove' into maint
* ia/ssl/delete-vs-remove: ssl: remove -> delete
Diffstat (limited to 'erts')
0 files changed, 0 insertions, 0 deletions