Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Thu, 20 May 2021 02:44:13 +0000 (11:44 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Thu, 20 May 2021 02:44:13 +0000 (11:44 +0900)
commit85e07e385018e24b7d4070c83ce2ce4332fa285f
tree074da63f4d964d7b55c4a684524228f99d5c0a87
parenta4b423aa4cb260924b732dc3e2c5fa0a2e08054f
parent1a9fef2b5c71f7a1c5426d402073243fcd9d5339
Merge branch 'master' into single-inheritance