diff options
| author | Ingela Anderton Andin <[email protected]> | 2017-11-24 11:23:46 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2017-11-24 11:23:46 +0100 |
| commit | eb2da85bf1f29000cd3c1b2f6dfbfcb5d6aec016 (patch) | |
| tree | a816b5b18445a4c5195b3312e41a81cc1218c525 /make | |
| parent | c17978f689ca8f9dd36f76fa8fcf448664921301 (diff) | |
| parent | b27269618782a033862df2f135cbff7073b30d69 (diff) | |
| download | otp-eb2da85bf1f29000cd3c1b2f6dfbfcb5d6aec016.tar.gz otp-eb2da85bf1f29000cd3c1b2f6dfbfcb5d6aec016.tar.bz2 otp-eb2da85bf1f29000cd3c1b2f6dfbfcb5d6aec016.zip | |
Merge branch 'ingela/dtls/merge-fix' into maint
* ingela/dtls/merge-fix:
ssl: Fix incorrect merge conflict resolution
Diffstat (limited to 'make')
0 files changed, 0 insertions, 0 deletions