Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Thu, 13 Jan 2022 15:13:22 +0000 (00:13 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Thu, 13 Jan 2022 15:13:22 +0000 (00:13 +0900)
commitd461f960eda49a51f74c2593d45f5cb990607eeb
tree59d7d48e3760fa70b8ec4cd0d8d0c484b1dcd34e
parentd7ae7e36f19c1733c62ec4e5a58926c8d2486099
parent5d9db3f7a4c76e48d7118aaa4d55de8936bf6337
Merge branch 'master' into single-inheritance