Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Sun, 28 Apr 2019 14:35:14 +0000 (23:35 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Sun, 28 Apr 2019 14:35:14 +0000 (23:35 +0900)
commit352e0297c4051fe0eb80787fb3eba72ce1b06561
tree8fbb3e3ab96de7c9dd4cb0f04693a22961840c4d
parent9ff0e1e632d3fc32cae860dbd5eb9e9370ad2bef
parentb02358cbcc6f6759d8326e39aadcdc9621c701e3
Merge branch 'master' into single-inheritance