OSDN Git Service

Merge pull request #1025 from Bytom/dev
authorPaladz <yzhu101@uottawa.ca>
Wed, 6 Jun 2018 11:48:04 +0000 (19:48 +0800)
committerGitHub <noreply@github.com>
Wed, 6 Jun 2018 11:48:04 +0000 (19:48 +0800)
Dev


Trivial merge