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)
commitef318fb8a96ddf276393f4ec81d3242dd7c6a4d4
treea030123a4bbe071613e87c41bee00333727208dc
parent059dd6f681caf14ee9d288ec14b82132be29ae2c
parent443d59baa05165c3b5b7ab14f3eabd6f2eba09f2
Merge branch 'develop' into fix/formatter-ignore-html-chars