Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Mon, 18 Feb 2019 05:17:23 +0000 (14:17 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Mon, 18 Feb 2019 05:17:23 +0000 (14:17 +0900)
commitfbdc6b413ff66bf8a89826601b0818f36a12508f
treed8d3c34d402ccdc98f3b03d26aee6fcb6b028653
parent6ad7ae50605e809f5ef4ae786e847a7443cf525a
parent124f6b7ff9a55e2a1b12425eae87148c7c4ddd5b
Merge branch 'master' into single-inheritance