OSDN Git Service

Merge pull request #848 from Bytom/dev
authorPaladz <yzhu101@uottawa.ca>
Thu, 26 Apr 2018 15:02:44 +0000 (23:02 +0800)
committerGitHub <noreply@github.com>
Thu, 26 Apr 2018 15:02:44 +0000 (23:02 +0800)
Dev


Trivial merge