aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2017-09-13 08:39:10 +0200
committerIngela Anderton Andin <[email protected]>2017-09-13 08:39:10 +0200
commitdbd613abcddf8c8ac7b837e1bf57f49070eb8d3a (patch)
treecdcf094e88ebc2d2ec8b1cc66e807be3886036b2 /erts/emulator
parentdcb66b30a2115e2a57436d800ed41880e5be633e (diff)
parent66e0aa61b84db86d52f081278c571852b3c90a62 (diff)
downloadotp-dbd613abcddf8c8ac7b837e1bf57f49070eb8d3a.tar.gz
otp-dbd613abcddf8c8ac7b837e1bf57f49070eb8d3a.tar.bz2
otp-dbd613abcddf8c8ac7b837e1bf57f49070eb8d3a.zip
Merge branch 'ingela/ssl/pem-dist/ERL-483' into maint
* ingela/ssl/pem-dist/ERL-483: ssl: Do not break abstraction
Diffstat (limited to 'erts/emulator')
0 files changed, 0 insertions, 0 deletions