Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Thu, 14 Mar 2019 11:32:46 +0000 (20:32 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Thu, 14 Mar 2019 11:32:46 +0000 (20:32 +0900)
commitc41aafc6b76e520c0b12bb757a6cf71ce5de2fce
tree3c1b00ad34f33ee0488da6ec935d94be5ff45c8d
parent0e5a1a869e267f82c52264539a55bb28d43f43ac
parentbce9fe792ffb7cb943f68942fe4b43b1e42bc311
Merge branch 'master' into single-inheritance