Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Fri, 29 Jun 2018 02:47:25 +0000 (11:47 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Fri, 29 Jun 2018 02:47:25 +0000 (11:47 +0900)
commit420fbc2462363a06fd6318704b34966b572bb560
treedd2e0e105ad6ce8470e461dd86cba1bdfdbebb75
parent87031b1cba0b9f7055902aab127151f065195a78
parentd391cccb675daf6503813ad8f8ffbce02e462380
Merge branch 'master' into single-inheritance