Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Mon, 9 Dec 2019 09:56:36 +0000 (18:56 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Mon, 9 Dec 2019 09:56:36 +0000 (18:56 +0900)
commit27c149b0e81f28cdf3025030384bb0b9c82b4791
tree0a2d4a44c2b13ad14a3105ca43cdd88133c6b78a
parentfb8235b340a888720333c022b3c7c8f37306a11a
parent37fb7737a6e16de8d5bb49f2a36ee62b8b42677e
Merge branch 'master' into single-inheritance