Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Tue, 8 Dec 2020 03:10:37 +0000 (12:10 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Tue, 8 Dec 2020 03:10:37 +0000 (12:10 +0900)
commit7deb967ee375fcfc5e3a3c17871e26d9d3eb4c14
treec376ab3b7bd7e4d34e97feb10e4baca9cc6751db
parentfead9c3caf7f161c53a53e1c8e592d19f9f2baff
parentdb93574bb3d69b492f333ab3fb6734ce8165d0a5
Merge branch 'master' into single-inheritance