Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Fri, 24 Apr 2020 11:25:56 +0000 (20:25 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Fri, 24 Apr 2020 11:25:56 +0000 (20:25 +0900)
commit866421a87b73f0f92f028019f625352fe0e45e15
tree8180c736d9cf900838e21e218b59d3a2103ee97c
parentc9c6092a6472bc07b67694501bf4b46f3e3f307c
parent93e5da5041fd844459bf859be5ccb6481c9ac02a
Merge branch 'master' into single-inheritance