diff options
author | Zandra Hird <[email protected]> | 2015-04-21 14:00:56 +0200 |
---|---|---|
committer | Zandra Hird <[email protected]> | 2015-04-21 14:00:56 +0200 |
commit | 40572e1bab65a70c6034827f6ec667f3f79f144d (patch) | |
tree | c6f972a68a24f034f3136f784a46e069863bf564 /.gitattributes | |
parent | 6ba93050fa369626b22cc608c7f874148bb0e5c1 (diff) | |
parent | 85dbd5ffdf1c8cd94f5bb39ca3401423b79ba693 (diff) | |
download | otp-40572e1bab65a70c6034827f6ec667f3f79f144d.tar.gz otp-40572e1bab65a70c6034827f6ec667f3f79f144d.tar.bz2 otp-40572e1bab65a70c6034827f6ec667f3f79f144d.zip |
Merge branch 'zandra/fix-ssl-obsolete-arity'
* zandra/fix-ssl-obsolete-arity:
add arity to obsolete_1(ssl, negotiated_next_protocol, 1)
Diffstat (limited to '.gitattributes')
0 files changed, 0 insertions, 0 deletions