OSDN Git Service

Merge pull request #1786 from Bytom/dev
authorPaladz <yzhu101@uottawa.ca>
Wed, 11 Sep 2019 08:00:56 +0000 (16:00 +0800)
committerGitHub <noreply@github.com>
Wed, 11 Sep 2019 08:00:56 +0000 (16:00 +0800)
update master


Trivial merge