Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Thu, 25 Jun 2020 12:06:41 +0000 (21:06 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Thu, 25 Jun 2020 12:06:41 +0000 (21:06 +0900)
commitb42c9906e330e59f5c544c18c6bc4f962cd6efcc
treeb7d9d660d7245ae1b24cf24965f149cfbd189871
parent7a90727d2a2b08b988a9d03cdce875707065ce79
parent3b469812da673496bc8b86fa7b6bb8150ace854b
Merge branch 'master' into single-inheritance