Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Mon, 10 Jun 2019 01:31:31 +0000 (10:31 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Mon, 10 Jun 2019 01:31:31 +0000 (10:31 +0900)
commit6dc04798360cf8e3bc3b983db31894fc6453abf0
treecd2048c8ac70a9d1d3fea1a9bf8e371c9a03936d
parent3f100adf6bc05c90053bb9898ff5b7aa40b190e4
parent1ed91f20cfea23eb2500ff8c733edf8c9b63a5c1
Merge branch 'master' into single-inheritance