Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Thu, 6 Feb 2020 15:34:06 +0000 (00:34 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Thu, 6 Feb 2020 15:34:06 +0000 (00:34 +0900)
commit42d8fd0392be789f218a249743225192d3ea0703
tree17dd4d94679e70f5601de1c591c07ebbeb4af405
parent8eeebb893d93eb270612cc8027b8587e3ccbc549
parent88903d82933572d5f5620042934b55ddc0c4bbdf
Merge branch 'master' into single-inheritance