OSDN Git Service

Merge master into develop
authorOlyutorskii <olyutorskii@users.osdn.me>
Wed, 5 Jun 2019 15:03:49 +0000 (00:03 +0900)
committerOlyutorskii <olyutorskii@users.osdn.me>
Wed, 5 Jun 2019 15:03:49 +0000 (00:03 +0900)
commit44852e4c8eba3222692905c257052a158ddfeaa9
treefce65316c0e1ea3340f2798129619d646604a4fe
parent852b68a3599840b75419008499ad6ddae51cfc5f
parent33403cac3d95399467317060af7ac875c6a1aaa5
Merge master into develop