Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Sun, 28 Apr 2019 06:49:56 +0000 (15:49 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Sun, 28 Apr 2019 06:49:56 +0000 (15:49 +0900)
commit9ff0e1e632d3fc32cae860dbd5eb9e9370ad2bef
treed0bf1470ee976e7109647dc3ce789a60a88db75c
parente6bf824e35e248b14efc550931c4ea5fbf7b5cef
parent6d50eed08db67d8d66cab7651b0dacc8867d712e
Merge branch 'master' into single-inheritance