diff options
| author | John Högberg <[email protected]> | 2018-07-24 09:06:49 +0200 |
|---|---|---|
| committer | John Högberg <[email protected]> | 2018-07-24 09:06:49 +0200 |
| commit | f1e97507e7fb4630220d8cf15939909d340997c8 (patch) | |
| tree | f93c2addaf49cd6a25b92cc0ff568a4ec21a64fa /lib/ssl | |
| parent | a6f8c69c4ea731c50d146e6cea5b2cd8f96e45a0 (diff) | |
| parent | f678e1b71987075cfd7816da7e7dd828ea630115 (diff) | |
| download | otp-f1e97507e7fb4630220d8cf15939909d340997c8.tar.gz otp-f1e97507e7fb4630220d8cf15939909d340997c8.tar.bz2 otp-f1e97507e7fb4630220d8cf15939909d340997c8.zip | |
Merge branch 'maint'
* maint:
Fix bad merge of otp_versions.table
Diffstat (limited to 'lib/ssl')
0 files changed, 0 insertions, 0 deletions