Merge branch 'develop' of https://github.com/ml-tooling/ssh-proxy into develop

raethlein · raethlein · commit a53649aa5ac4 · 2019-07-23T13:21:29.000+02:00
# Conflicts:
#	README.md
diff --git a/README.md b/README.md
@@ -146,4 +146,4 @@ valuable if it's shared publicly so that more people can benefit from it.
 
 ---
 
-Licensed **Apache 2.0**. Created and maintained with ❤️ by developers from SAP in Berlin. 
+Licensed **Apache 2.0**. Created and maintained with ❤️ by developers from SAP in Berlin. 

Original file line number	Diff line number	Diff line change
`@@ -146,4 +146,4 @@ valuable if it's shared publicly so that more people can benefit from it.`
`146`	`146`
`147`	`147`	`---`
`148`	`148`
`149`		`-Licensed Apache 2.0. Created and maintained with ❤️ by developers from SAP in Berlin.`
	`149`	`+Licensed Apache 2.0. Created and maintained with ❤️ by developers from SAP in Berlin.`