Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Mon, 12 Oct 2020 00:43:08 +0000 (09:43 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Mon, 12 Oct 2020 00:43:08 +0000 (09:43 +0900)
commit841ddc3646c58c26e7a1e261d812f8a78ad5f87c
tree45396fb15976cd8dccced93548027dcefb4fa654
parentddd30b06a0524bb1420df97ae8481c2080f14845
parent0a23f313c1a0700d4a6275576816d029ea9e00ec
Merge branch 'master' into single-inheritance