Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Tue, 23 Mar 2021 10:11:39 +0000 (19:11 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Tue, 23 Mar 2021 10:11:39 +0000 (19:11 +0900)
commit786858322936ee7e4b599dcbc743e43e07c24ca2
treef3e6e75d0f7b3a5ebdb743f62f4115286b50f2c8
parentfefd0abbbd4a52ee561d330227c2f8fc17220f43
parentd276a24cfda058a584c22daa98fcdaa0d584fdc3
Merge branch 'master' into single-inheritance