diff options
| author | Erlang/OTP <[email protected]> | 2015-12-03 11:11:01 +0100 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2015-12-03 11:11:01 +0100 |
| commit | 64fd2820d57282ab782fb5f7edec643fdd08f117 (patch) | |
| tree | 4ba93480de4584711fb928ecefd8337779de5b13 /erts/vsn.mk | |
| parent | df7c7b59c9f1b796e72d1d27a35a61f1392d7f23 (diff) | |
| parent | 97531f2f4dbd4bf7426434792e7e6af6aa8e12ef (diff) | |
| download | otp-64fd2820d57282ab782fb5f7edec643fdd08f117.tar.gz otp-64fd2820d57282ab782fb5f7edec643fdd08f117.tar.bz2 otp-64fd2820d57282ab782fb5f7edec643fdd08f117.zip | |
Merge branch 'ia/ssl/maint-17/backport-of-18-fix' into maint-17
* ia/ssl/maint-17/backport-of-18-fix:
ssl: Prepare for release
ssl: Do not crash on proprietary hash_sign algorithms
Diffstat (limited to 'erts/vsn.mk')
0 files changed, 0 insertions, 0 deletions