OSDN Git Service

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

Trivial merge