OSDN Git Service

Merge pull request #1297 from Bytom/dev
authorPaladz <yzhu101@uottawa.ca>
Wed, 29 Aug 2018 14:39:19 +0000 (22:39 +0800)
committerGitHub <noreply@github.com>
Wed, 29 Aug 2018 14:39:19 +0000 (22:39 +0800)
Dev


Trivial merge