aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2016-02-19 10:27:23 +0100
committerIngela Anderton Andin <[email protected]>2016-02-19 10:27:23 +0100
commitd0002b70b1f948dcef3e08781b9db589907776c5 (patch)
treea6dfbeb463815058701852260870444292193e21 /erts/emulator
parent68c875fe49a712041b7d9dd2c7c6f9ab5fdc19f2 (diff)
parenteca306d6d4e2ade65bd743f59526bc072dea1771 (diff)
downloadotp-d0002b70b1f948dcef3e08781b9db589907776c5.tar.gz
otp-d0002b70b1f948dcef3e08781b9db589907776c5.tar.bz2
otp-d0002b70b1f948dcef3e08781b9db589907776c5.zip
Merge branch 'ia/pr/public_key-typos' into maint
* ia/pr/public_key-typos: Fix public_key documentation typos To correct version of public_key doc in maint, due to a missed push of maint but a push of the maint to master merge, some confusion was caused. Also the original branch (ia/pr/typo-fixes) included ssl typo fixes that where cherry picked and merged from another branch to add to the confusion.
Diffstat (limited to 'erts/emulator')
0 files changed, 0 insertions, 0 deletions