OSDN Git Service

Merge master into develop
authorOlyutorskii <olyutorskii@users.osdn.me>
Mon, 6 May 2019 14:20:19 +0000 (23:20 +0900)
committerOlyutorskii <olyutorskii@users.osdn.me>
Mon, 6 May 2019 14:20:19 +0000 (23:20 +0900)
commit5fc41192649751b4970df344eab0a980ab084eb7
tree18ef7420c6101e2ba59b0bcb04abfbd6e7281017
parentcb4272760807024a122f660f79459e9a3daef8f5
parent3f2436aaf0b0ebf7ab92385c601a5a22f154ef4b
Merge master into develop