diff options
| author | Hans Nilsson <[email protected]> | 2017-12-15 12:36:00 +0100 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2017-12-15 12:36:00 +0100 |
| commit | 056488f7d978efcbd70d6c23cde32ef6f2dc5f49 (patch) | |
| tree | 961d47103721f2f839e97693352526c1f1837251 /erts/etc/common | |
| parent | 5ad63d8a404db14edbb221565baf518728b71426 (diff) | |
| parent | ffc5d16de3350e754a4d4da2be42d29b821233e1 (diff) | |
| download | otp-056488f7d978efcbd70d6c23cde32ef6f2dc5f49.tar.gz otp-056488f7d978efcbd70d6c23cde32ef6f2dc5f49.tar.bz2 otp-056488f7d978efcbd70d6c23cde32ef6f2dc5f49.zip | |
Merge branch 'maint'
* maint:
Updated OTP version
Prepare release
ssh: Special treatment of OpenSSH clients >= 7.2 rsa-sha2-* public keys
Conflicts:
OTP_VERSION
Diffstat (limited to 'erts/etc/common')
0 files changed, 0 insertions, 0 deletions