OSDN Git Service

Merge branch 'dev'
authorhayao <shun819.mail@gmail.com>
Mon, 10 Feb 2020 12:39:18 +0000 (21:39 +0900)
committerhayao <shun819.mail@gmail.com>
Mon, 10 Feb 2020 12:39:18 +0000 (21:39 +0900)

Trivial merge