Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Wed, 27 Feb 2019 14:02:09 +0000 (23:02 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Wed, 27 Feb 2019 14:02:09 +0000 (23:02 +0900)
commit796681207249c865878643a7eb1734697a27e26b
tree938fe3c4cb7f03345183f510120b6196b95a16b8
parent7cc6865be00d6e1db2ddffd877b453930bcc9363
parent5e408fc4db7fb7c3ffb11ba1bcdebfb47094d320
Merge branch 'master' into single-inheritance