Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Wed, 17 Oct 2018 02:34:16 +0000 (11:34 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Wed, 17 Oct 2018 02:34:16 +0000 (11:34 +0900)
commit2e4428389563062a23908b0bf55ee4980bd3ca51
treea68f024065559250eb4d8a97b2b56d8076cb5e0a
parent2a5661cc0c095f5e18754f827fd29d40ca18db1d
parentdf77a7cc216bd45cc2a82e4d3c123bf744809a2f
Merge branch 'master' into single-inheritance