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

author rinpatch <rinpatch@sdf.org>

Tue, 13 Aug 2019 22:51:15 +0000 (22:51 +0000)

committer rinpatch <rinpatch@sdf.org>

Tue, 13 Aug 2019 22:51:15 +0000 (22:51 +0000)
author rinpatch <rinpatch@sdf.org>
Tue, 13 Aug 2019 22:51:15 +0000 (22:51 +0000)
committer rinpatch <rinpatch@sdf.org>
Tue, 13 Aug 2019 22:51:15 +0000 (22:51 +0000)
diff --cc CHANGELOG.md
Simple merge
diff --cc config/config.exs
Simple merge
diff --cc docs/config.md
Simple merge
author	rinpatch <rinpatch@sdf.org>
	Tue, 13 Aug 2019 22:51:15 +0000 (22:51 +0000)
committer	rinpatch <rinpatch@sdf.org>
	Tue, 13 Aug 2019 22:51:15 +0000 (22:51 +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