OSDN Git Service

Merge master into develop
authorOlyutorskii <olyutorskii@users.osdn.me>
Tue, 7 May 2019 08:48:03 +0000 (17:48 +0900)
committerOlyutorskii <olyutorskii@users.osdn.me>
Tue, 7 May 2019 08:48:03 +0000 (17:48 +0900)
commit80c7027381457fc844d693c1d8f7629eea9ee912
tree9bbd7fd5d2ef5dd06c08a051c6c456b55ffed567
parent47150fcdf231e56109107a5f8f9953aabb81dfec
parent1a6a422c010ffa0923fcf83be67ffea8acc8f373
Merge master into develop