Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Tue, 8 Dec 2020 16:28:00 +0000 (01:28 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Tue, 8 Dec 2020 16:28:00 +0000 (01:28 +0900)
commitd14efda9110ce7ec930e97f7e18fbc1eed817977
tree3d695c8ffc40ec6c392548dc522d47f50e35e3c2
parent7deb967ee375fcfc5e3a3c17871e26d9d3eb4c14
parent93fe428a68305451baac71d71fe1270d124d0e30
Merge branch 'master' into single-inheritance