Merge branch 'develop' into feature/digest-email

author Roman Chvanikov <chvanikoff@pm.me>

Sun, 30 Jun 2019 18:23:35 +0000 (21:23 +0300)

committer Roman Chvanikov <chvanikoff@pm.me>

Sun, 30 Jun 2019 18:23:35 +0000 (21:23 +0300)
author Roman Chvanikov <chvanikoff@pm.me>
Sun, 30 Jun 2019 18:23:35 +0000 (21:23 +0300)
committer Roman Chvanikov <chvanikoff@pm.me>
Sun, 30 Jun 2019 18:23:35 +0000 (21:23 +0300)
diff --cc CHANGELOG.md
Simple merge
diff --cc docs/config.md
Simple merge
author	Roman Chvanikov <chvanikoff@pm.me>
	Sun, 30 Jun 2019 18:23:35 +0000 (21:23 +0300)
committer	Roman Chvanikov <chvanikoff@pm.me>
	Sun, 30 Jun 2019 18:23:35 +0000 (21:23 +0300)
		1	2
CHANGELOG.md	patch \|	diff1 \|	diff2 \|	blob \| history
docs/config.md	patch \|	diff1 \|	diff2 \|	blob \| history