aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssh/src
diff options
context:
space:
mode:
authorHans Nilsson <[email protected]>2017-02-03 11:38:02 +0100
committerHans Nilsson <[email protected]>2017-02-03 11:38:02 +0100
commit4208945259f1a32f4261fc603b2f2be9057c5d50 (patch)
tree0dcb00848ee6af8364546b4bf9ab23ede97c862e /lib/ssh/src
parent24dc54fdb810fa29c13b7bd4d38c8d940b939cdc (diff)
parentb2f2d1059fda823d3f71086a77adeb99d5475b94 (diff)
downloadotp-4208945259f1a32f4261fc603b2f2be9057c5d50.tar.gz
otp-4208945259f1a32f4261fc603b2f2be9057c5d50.tar.bz2
otp-4208945259f1a32f4261fc603b2f2be9057c5d50.zip
erge branch 'maint'
Conflicts: OTP_VERSION
Diffstat (limited to 'lib/ssh/src')
-rw-r--r--lib/ssh/src/ssh.app.src1
1 files changed, 0 insertions, 1 deletions
diff --git a/lib/ssh/src/ssh.app.src b/lib/ssh/src/ssh.app.src
index 76b7d8cd55..2bb7491b0c 100644
--- a/lib/ssh/src/ssh.app.src
+++ b/lib/ssh/src/ssh.app.src
@@ -48,4 +48,3 @@
"stdlib-3.1"
]}]}.
-