diff options
| author | Ingela Anderton Andin <[email protected]> | 2018-08-22 12:17:19 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2018-08-22 12:17:19 +0200 |
| commit | 9a95f6f1cda59e337b11f5213c932f7fbdc17a61 (patch) | |
| tree | c8aa4529c63665e313d2016dda184121242688ad /.mailmap | |
| parent | 1b9829f78970547659d73ed5d437f0b66d69c40f (diff) | |
| parent | 669419137b631b895efce327e0aee9ace03c2ba0 (diff) | |
| download | otp-9a95f6f1cda59e337b11f5213c932f7fbdc17a61.tar.gz otp-9a95f6f1cda59e337b11f5213c932f7fbdc17a61.tar.bz2 otp-9a95f6f1cda59e337b11f5213c932f7fbdc17a61.zip | |
Merge branch 'maint'
Conflicts:
lib/ssl/src/ssl_cipher.erl
Diffstat (limited to '.mailmap')
0 files changed, 0 insertions, 0 deletions