OSDN Git Service

Merge pull request #1046 from Bytom/dev
authorPaladz <yzhu101@uottawa.ca>
Tue, 12 Jun 2018 08:18:58 +0000 (16:18 +0800)
committerGitHub <noreply@github.com>
Tue, 12 Jun 2018 08:18:58 +0000 (16:18 +0800)
Dev


Trivial merge