Merge branch 'feature/mrf-subchain' into 'develop'

author kaniini <nenolod@gmail.com>

Tue, 4 Jun 2019 05:49:54 +0000 (05:49 +0000)

committer kaniini <nenolod@gmail.com>

Tue, 4 Jun 2019 05:49:54 +0000 (05:49 +0000)
author kaniini <nenolod@gmail.com>
Tue, 4 Jun 2019 05:49:54 +0000 (05:49 +0000)
committer kaniini <nenolod@gmail.com>
Tue, 4 Jun 2019 05:49:54 +0000 (05:49 +0000)
diff --cc CHANGELOG.md
Simple merge
diff --cc config/config.exs
Simple merge
diff --cc docs/config.md
Simple merge
author	kaniini <nenolod@gmail.com>
	Tue, 4 Jun 2019 05:49:54 +0000 (05:49 +0000)
committer	kaniini <nenolod@gmail.com>
	Tue, 4 Jun 2019 05:49:54 +0000 (05:49 +0000)
		1	2
CHANGELOG.md	patch \|	diff1 \|	diff2 \|	blob \| history
config/config.exs	patch \|	diff1 \|	diff2 \|	blob \| history
docs/config.md	patch \|	diff1 \|	diff2 \|	blob \| history