OSDN Git Service

Merge pull request #1300 from Bytom/dev v1.0.5
authorPaladz <yzhu101@uottawa.ca>
Thu, 30 Aug 2018 03:17:30 +0000 (11:17 +0800)
committerGitHub <noreply@github.com>
Thu, 30 Aug 2018 03:17:30 +0000 (11:17 +0800)
Dev


Trivial merge