OSDN Git Service

Merge branch 'dev' into dev-stable
authorhayao <shun819.mail@gmail.com>
Fri, 25 Dec 2020 15:32:08 +0000 (00:32 +0900)
committerhayao <shun819.mail@gmail.com>
Fri, 25 Dec 2020 15:32:08 +0000 (00:32 +0900)

Trivial merge