Merge branch 'develop' into issue/1383

author Maksim Pechnikov <parallel588@gmail.com>

Mon, 10 Feb 2020 17:49:20 +0000 (20:49 +0300)

committer Maksim Pechnikov <parallel588@gmail.com>

Mon, 10 Feb 2020 17:49:20 +0000 (20:49 +0300)
author Maksim Pechnikov <parallel588@gmail.com>
Mon, 10 Feb 2020 17:49:20 +0000 (20:49 +0300)
committer Maksim Pechnikov <parallel588@gmail.com>
Mon, 10 Feb 2020 17:49:20 +0000 (20:49 +0300)
diff --cc config/config.exs
Simple merge
diff --cc config/description.exs
Simple merge
diff --cc docs/configuration/cheatsheet.md
Simple merge
diff --cc mix.exs
Simple merge
diff --cc mix.lock
Simple merge
author	Maksim Pechnikov <parallel588@gmail.com>
	Mon, 10 Feb 2020 17:49:20 +0000 (20:49 +0300)
committer	Maksim Pechnikov <parallel588@gmail.com>
	Mon, 10 Feb 2020 17:49:20 +0000 (20:49 +0300)
		1	2
config/config.exs	patch \|	diff1 \|	diff2 \|	blob \| history
config/description.exs	patch \|	diff1 \|	diff2 \|	blob \| history
docs/configuration/cheatsheet.md	patch \|	diff1 \|	diff2 \|	blob \| history
mix.exs	patch \|	diff1 \|	diff2 \|	blob \| history
mix.lock	patch \|	diff1 \|	diff2 \|	blob \| history