Merge branch 'develop' into cleanup/drop-subscription-table-if-exists
authorrinpatch <rinpatch@sdf.org>
Sun, 29 Sep 2019 21:26:49 +0000 (00:26 +0300)
committerrinpatch <rinpatch@sdf.org>
Sun, 29 Sep 2019 21:26:49 +0000 (00:26 +0300)

Trivial merge