Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Wed, 19 Jun 2019 13:52:34 +0000 (22:52 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Wed, 19 Jun 2019 13:52:34 +0000 (22:52 +0900)
commit181e93d409ec123bfaeaec3bf7f96ad034735fd9
treeacf897830272c10121a5e53203ad91826182487a
parent6ef149abeba0451887f9557d8a8a3f8ceba3080e
parent921dd22a3f8f94d9cc097cdbceeda0d9bef84a4b
Merge branch 'master' into single-inheritance