Merge branch 'ssh-fixes' into 'develop'

author kaniini <nenolod@gmail.com>

Wed, 22 May 2019 18:57:34 +0000 (18:57 +0000)

committer kaniini <nenolod@gmail.com>

Wed, 22 May 2019 18:57:34 +0000 (18:57 +0000)
author kaniini <nenolod@gmail.com>
Wed, 22 May 2019 18:57:34 +0000 (18:57 +0000)
committer kaniini <nenolod@gmail.com>
Wed, 22 May 2019 18:57:34 +0000 (18:57 +0000)
diff --cc CHANGELOG.md
Simple merge
diff --cc docs/config.md
Simple merge
diff --cc mix.exs
Simple merge
author	kaniini <nenolod@gmail.com>
	Wed, 22 May 2019 18:57:34 +0000 (18:57 +0000)
committer	kaniini <nenolod@gmail.com>
	Wed, 22 May 2019 18:57:34 +0000 (18:57 +0000)
		1	2
CHANGELOG.md	patch \|	diff1 \|	diff2 \|	blob \| history
docs/config.md	patch \|	diff1 \|	diff2 \|	blob \| history
mix.exs	patch \|	diff1 \|	diff2 \|	blob \| history