OSDN Git Service

Merge pull request #1475 from Bytom/dev
authorPaladz <yzhu101@uottawa.ca>
Fri, 16 Nov 2018 04:04:10 +0000 (12:04 +0800)
committerGitHub <noreply@github.com>
Fri, 16 Nov 2018 04:04:10 +0000 (12:04 +0800)
Dev


Trivial merge