OSDN Git Service

Merge branch 'master' into dev-blockindex
authoroys <oys@oysdeMBP.localdomain>
Tue, 25 Jun 2019 03:00:04 +0000 (11:00 +0800)
committeroys <oys@oysdeMBP.localdomain>
Tue, 25 Jun 2019 03:00:04 +0000 (11:00 +0800)

Trivial merge