OSDN Git Service

Merge master into develop
authorOlyutorskii <olyutorskii@users.osdn.me>
Thu, 4 Jul 2019 07:28:06 +0000 (16:28 +0900)
committerOlyutorskii <olyutorskii@users.osdn.me>
Thu, 4 Jul 2019 07:28:06 +0000 (16:28 +0900)
commit58007df5978281599ff8f0780a4db8d8dc5db319
tree8a25d82ee943c14b77a4997663a50bd221da3a39
parentce72a21dffd4f9f3158985531fadf02d000671af
parentf5ccf9a8f0902b0b8d4fc4f00d8059357e2880c6
Merge master into develop