OSDN Git Service

Merge master into develop
authorOlyutorskii <olyutorskii@users.osdn.me>
Thu, 6 Jun 2019 05:00:48 +0000 (14:00 +0900)
committerOlyutorskii <olyutorskii@users.osdn.me>
Thu, 6 Jun 2019 05:00:48 +0000 (14:00 +0900)
commitf48a1cc3aff3b19d4515aa569ed0b2446cf869ff
tree85bdea283fb62cf8139375e0ecdd1c1eecb73e5e
parent8a162359699747a47ada3c3ff31b6ea2fef27826
parenta1cb138cfa1a2c2d84c3971d2660575ca5eb7291
Merge master into develop