OSDN Git Service

Merge pull request #1071 from Bytom/dev
authorPaladz <yzhu101@uottawa.ca>
Tue, 19 Jun 2018 02:17:33 +0000 (10:17 +0800)
committerGitHub <noreply@github.com>
Tue, 19 Jun 2018 02:17:33 +0000 (10:17 +0800)
Dev


Trivial merge