Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Wed, 13 Jun 2018 13:42:31 +0000 (22:42 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Wed, 13 Jun 2018 13:42:31 +0000 (22:42 +0900)
commitb46ffce4c4a00f07157c9ae421a118e32ed0ce21
treec3d5ff0e54d1614121111cb6d5999f1f417c9a3e
parent13694028cf3d172682757a7ccbdd43209abb9082
parent0d83c23c319751850760298ca61808af61b24105
Merge branch 'master' into single-inheritance