Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Mon, 18 Mar 2019 06:38:18 +0000 (15:38 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Mon, 18 Mar 2019 06:38:18 +0000 (15:38 +0900)
commit4a39538a66569946e5c9ae7e7fa0a086d9f09e63
tree4399f33ffc1b0c5e93cc66e605de5f15ba99c69c
parent804168eba15f2a63d24a2415453ad162ece3193c
parent5817def4cd3becbef73a2ae4fde5badc56842578
Merge branch 'master' into single-inheritance