diff options
| author | Ingela Anderton Andin <[email protected]> | 2018-10-11 12:35:08 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2018-10-11 12:35:08 +0200 |
| commit | 72f13b54829879f05fae656494067ce92455b856 (patch) | |
| tree | 8853f53e7124b51b4bab233e7a10841b8d1a844f /system | |
| parent | b0e23e7b54909be811a962cc1cf075cfbea403b9 (diff) | |
| parent | 6163856b3bd78d1948a8e9e91e646d6c169aa310 (diff) | |
| download | otp-72f13b54829879f05fae656494067ce92455b856.tar.gz otp-72f13b54829879f05fae656494067ce92455b856.tar.bz2 otp-72f13b54829879f05fae656494067ce92455b856.zip | |
Merge branch 'ingela/ssl/merge-fix' into maint
* ingela/ssl/merge-fix:
ssl: Fix up incorrect automatic merge
Diffstat (limited to 'system')
0 files changed, 0 insertions, 0 deletions