Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Mon, 9 Dec 2019 14:16:12 +0000 (23:16 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Mon, 9 Dec 2019 14:16:12 +0000 (23:16 +0900)
commit921560b689b21d57f2f9bea4049ee69832469eee
treec84163925f76cebdc1004cdb1f8568aabf30efab
parent27c149b0e81f28cdf3025030384bb0b9c82b4791
parent1334d5f43049290b1768f22c06d7720a342a8827
Merge branch 'master' into single-inheritance