Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Thu, 10 Dec 2020 02:28:31 +0000 (11:28 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Thu, 10 Dec 2020 02:28:31 +0000 (11:28 +0900)
commit2a392d9477f33183f23176eb4d3903f1891decfb
tree78a282fb7178370e2088298d7c6e66b511b4e0b3
parentd14efda9110ce7ec930e97f7e18fbc1eed817977
parentc1cb424956a4cf9d406fa07d1e6809a6f25c37d4
Merge branch 'master' into single-inheritance