mirror of
https://github.com/cuberite/polarssl.git
synced 2025-09-09 15:22:11 -04:00
Fix merge glitch in ChangeLog
This commit is contained in:
parent
f4e5b7e87d
commit
e4d3b7f860
@ -326,7 +326,6 @@ Changes
|
|||||||
implementation.
|
implementation.
|
||||||
* Add explicit warnings for the use of MD2, MD4, MD5, SHA-1, DES and ARC4
|
* Add explicit warnings for the use of MD2, MD4, MD5, SHA-1, DES and ARC4
|
||||||
throughout the library.
|
throughout the library.
|
||||||
>>>>>>> development
|
|
||||||
|
|
||||||
= mbed TLS 2.6.0 branch released 2017-08-10
|
= mbed TLS 2.6.0 branch released 2017-08-10
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user