Merge branch 'develop' into fix/formatter-ignore-html-chars
authorrinpatch <rinpatch@sdf.org>
Tue, 18 Dec 2018 18:39:36 +0000 (21:39 +0300)
committerrinpatch <rinpatch@sdf.org>
Tue, 18 Dec 2018 18:39:36 +0000 (21:39 +0300)

Trivial merge