Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Mon, 11 Jan 2021 07:51:04 +0000 (16:51 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Mon, 11 Jan 2021 07:51:04 +0000 (16:51 +0900)
commit396529ca3f8637644c388f000c9d8f8d2a5fbac9
tree93d0869862a395ccaf0819e9ed532317450437ef
parent6da2ab2936864a2de40e467dca83e976c01508f2
parentc4533ada6f09d6725053a0375689f5e5a678d5a4
Merge branch 'master' into single-inheritance