OSDN Git Service

Merge branch 'master' into merge_tx_signer
authorshenao78 <shenao.78@163.com>
Thu, 21 Mar 2019 09:02:18 +0000 (17:02 +0800)
committershenao78 <shenao.78@163.com>
Thu, 21 Mar 2019 09:02:18 +0000 (17:02 +0800)

Trivial merge