diff options
| author | Erlang/OTP <[email protected]> | 2017-02-01 18:32:27 +0100 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2017-02-01 18:32:27 +0100 |
| commit | 5ac71f14c657fde3c01d4f15f1509e7fca6c9c96 (patch) | |
| tree | 9bfbc4f4204ddf96cf7c02ef84a25feb04c6bd61 /.gitattributes | |
| parent | f74baa361cf8b3af437f75aa1ec5a1886005261c (diff) | |
| parent | e27119948fc6ab28bea81019720bddaac5b655a7 (diff) | |
| download | otp-5ac71f14c657fde3c01d4f15f1509e7fca6c9c96.tar.gz otp-5ac71f14c657fde3c01d4f15f1509e7fca6c9c96.tar.bz2 otp-5ac71f14c657fde3c01d4f15f1509e7fca6c9c96.zip | |
Merge branch 'sverker/bin2term-zlib-bug/ERL-340/OTP-14159' into maint-18
* sverker/bin2term-zlib-bug/ERL-340/OTP-14159:
erts: Fix binary_to_term for compressed and zlib >= v1.2.9
Diffstat (limited to '.gitattributes')
0 files changed, 0 insertions, 0 deletions