diff options
author | Ingela Anderton Andin <[email protected]> | 2016-12-06 09:05:56 +0100 |
---|---|---|
committer | Ingela Anderton Andin <[email protected]> | 2016-12-06 09:05:56 +0100 |
commit | 22e8ef1bb3597376f840cf337826bcc534501058 (patch) | |
tree | 34aa51d10e3e06ed18e53c104472eeb98a1a59e4 /erts/obj.debug | |
parent | b91e7498e625b4e6419238f753c30b509fb958d2 (diff) | |
parent | 1413bac07a4f2003411a77120e49a3fb25e70e6a (diff) | |
download | otp-22e8ef1bb3597376f840cf337826bcc534501058.tar.gz otp-22e8ef1bb3597376f840cf337826bcc534501058.tar.bz2 otp-22e8ef1bb3597376f840cf337826bcc534501058.zip |
Merge branch 'ingela/ssl/next-version' into maint
* ingela/ssl/next-version:
ssl: Prepare for release
Diffstat (limited to 'erts/obj.debug')
0 files changed, 0 insertions, 0 deletions