diff options
| author | Hans Nilsson <[email protected]> | 2018-03-02 12:13:28 +0100 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2018-03-02 12:13:28 +0100 |
| commit | 81b7a88884fd4ec36fd08680d04bff01d45e5548 (patch) | |
| tree | adcd873533dd9e65df493c7cc9bea6902857d8ca /.mailmap | |
| parent | 79f8a5dfff65f06b8975e1765f52ee6a04d85001 (diff) | |
| parent | 33521da61673b890bcd05eda02f38fea1fe58a30 (diff) | |
| download | otp-81b7a88884fd4ec36fd08680d04bff01d45e5548.tar.gz otp-81b7a88884fd4ec36fd08680d04bff01d45e5548.tar.bz2 otp-81b7a88884fd4ec36fd08680d04bff01d45e5548.zip | |
Merge branch 'maint-19' into maint
* maint-19:
Updated OTP version
Prepare release
ssl: Prepare for release
ssl: Backport PR-1709
ssh: Fix cli
ssh: Test for disabled shell
Conflicts:
OTP_VERSION
lib/ssh/doc/src/notes.xml
lib/ssh/src/ssh.erl
lib/ssh/vsn.mk
lib/ssl/doc/src/notes.xml
lib/ssl/vsn.mk
otp_versions.table
Diffstat (limited to '.mailmap')
0 files changed, 0 insertions, 0 deletions