Merge branch 'develop' into feature/keyword-policy

author rinpatch <rinpatch@sdf.org>

Fri, 8 Feb 2019 10:12:33 +0000 (13:12 +0300)

committer rinpatch <rinpatch@sdf.org>

Fri, 8 Feb 2019 10:12:33 +0000 (13:12 +0300)
author rinpatch <rinpatch@sdf.org>
Fri, 8 Feb 2019 10:12:33 +0000 (13:12 +0300)
committer rinpatch <rinpatch@sdf.org>
Fri, 8 Feb 2019 10:12:33 +0000 (13:12 +0300)
diff --cc config/config.exs
Simple merge
diff --cc docs/config.md
Simple merge
author	rinpatch <rinpatch@sdf.org>
	Fri, 8 Feb 2019 10:12:33 +0000 (13:12 +0300)
committer	rinpatch <rinpatch@sdf.org>
	Fri, 8 Feb 2019 10:12:33 +0000 (13:12 +0300)
		1	2
config/config.exs	patch \|	diff1 \|	diff2 \|	blob \| history
docs/config.md	patch \|	diff1 \|	diff2 \|	blob \| history