Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Sat, 11 May 2019 14:42:30 +0000 (23:42 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Sat, 11 May 2019 14:42:30 +0000 (23:42 +0900)
commit2fac525d1e5fa25448aa1acd1c6bd6162d121cdc
treed5d7c97ccd67d0d9d7227cf1ab733ab2b7b0f3d3
parent7142037fd6d9cfc3f01afe62295167396542cb89
parentb34077e965dff4dd890f01f223a2fbd3b06f5b8d
Merge branch 'master' into single-inheritance