mirror of
https://github.com/cuberite/polarssl.git
synced 2025-12-09 15:24:32 -05:00
Conflict resolution: * ChangeLog: put the new entries in their rightful place. * library/x509write_crt.c: the change in development was whitespace only, so use the one from the iotssl-1251 feature branch.