aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssl/priv
diff options
context:
space:
mode:
authorRickard Green <[email protected]>2017-10-05 19:25:50 +0200
committerRickard Green <[email protected]>2017-10-05 19:25:50 +0200
commit3f4aac5b00959d3f0ddfaf54a3163cd75053dd24 (patch)
treeee03096415bb249e5cf52dc5ada7b5f8f0f1dd77 /lib/ssl/priv
parent1d1fbedf082111c0e98415f69f8a7e21436cf54d (diff)
parent2cc46961352aded5c84ecb9bcb32581461dbc047 (diff)
downloadotp-3f4aac5b00959d3f0ddfaf54a3163cd75053dd24.tar.gz
otp-3f4aac5b00959d3f0ddfaf54a3163cd75053dd24.tar.bz2
otp-3f4aac5b00959d3f0ddfaf54a3163cd75053dd24.zip
Merge branch 'maint-19' into maint
* maint-19: Updated OTP version Update release notes Update version numbers Conflicts: OTP_VERSION erts/doc/src/notes.xml erts/vsn.mk lib/compiler/doc/src/notes.xml lib/compiler/vsn.mk otp_versions.table
Diffstat (limited to 'lib/ssl/priv')
0 files changed, 0 insertions, 0 deletions