Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Tue, 4 Feb 2020 13:57:55 +0000 (22:57 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Tue, 4 Feb 2020 13:57:55 +0000 (22:57 +0900)
commitc0c8d0def3bfd204e34e426a45aef0f610c0fb9a
tree7f7c64da62f0da8e438135396a6c7148451f999e
parent014cb24a013b191a01fd6fcc92f5aad516a6062e
parent7c559efdf540a59f0c097c015ee95d9dddb59bf1
Merge branch 'master' into single-inheritance