Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Sat, 20 Feb 2021 17:21:40 +0000 (02:21 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Sat, 20 Feb 2021 17:21:40 +0000 (02:21 +0900)
commit3f3f861524716e4785f7ab90e2d68b2df694c706
treea35c66b50c5d9f44feafb5b64f2edb77f285167e
parent5aa010bd97b6a1ed1d7745f26e387521c66a0354
parent4c9d10b3611db657720fcb3128d5af5abb96bfc4
Merge branch 'master' into single-inheritance