Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Mon, 3 Feb 2020 17:01:09 +0000 (02:01 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Mon, 3 Feb 2020 17:01:09 +0000 (02:01 +0900)
commit014cb24a013b191a01fd6fcc92f5aad516a6062e
tree3ffac1b39d965a6d139f81065eb269dcd5a799c6
parent49b859a0c6102153a282832c41a5ff24a0aa6b40
parentd46706019205287eb9817c1902c931c3fb70e738
Merge branch 'master' into single-inheritance