Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Thu, 4 Oct 2018 13:36:20 +0000 (22:36 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Thu, 4 Oct 2018 13:36:20 +0000 (22:36 +0900)
commit42ba74d27d739cfd361169b56a934cd125eccf45
tree0800ebf62d58ca7f381f5baceafbe4420dd40182
parent66506939709b8580d890a61d24433fca6c8d6af1
parent0f5d22e1ce9c7ce4e7b6b2f02092453a01ccd60f
Merge branch 'master' into single-inheritance