OSDN Git Service

Merge remote-tracking branch '24OI/master' into patch-2
authorIr1d <sirius.caffrey@gmail.com>
Fri, 9 Aug 2019 02:10:02 +0000 (10:10 +0800)
committerIr1d <sirius.caffrey@gmail.com>
Fri, 9 Aug 2019 02:10:02 +0000 (10:10 +0800)
commit70fa74e1ee4c07dbad66affb2e6117d60bf0e72a
tree9cc9e34b07f59cb326714b829694e273929820e3
parentfa0c74de7ef6f02930412e7cf1e14e7c20dad10a
parent0b8e84aa554fbceb26dbbaf6cf1e0a4a2ae051e3
Merge remote-tracking branch '24OI/master' into patch-2