Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Sat, 22 Sep 2018 03:43:56 +0000 (12:43 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Sat, 22 Sep 2018 03:43:56 +0000 (12:43 +0900)
commit2a22138363923c6a4262af60442aaa23a52af3a7
tree5ee5353e3199d4e0b1f8c5c209de3a957548db75
parent6ae50cabae6ee9802622879b59ee884c00b756c9
parenta9579f76e0c41842f8a10cd8d23dfe760894f32e
Merge branch 'master' into single-inheritance