Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Mon, 7 Sep 2020 13:35:04 +0000 (22:35 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Mon, 7 Sep 2020 13:35:04 +0000 (22:35 +0900)
commit7ca11c02f57fcf0dad7cc0eb186804247c51f490
tree8e41b462a42f0446999367029551a47f508f3456
parentc837a68783b00ffe3e5a348a88d31892eb728227
parent4ec3a8c53325f58f61176f83aecf2b0f97d10fc7
Merge branch 'master' into single-inheritance