Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Fri, 17 Aug 2018 21:13:24 +0000 (06:13 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Fri, 17 Aug 2018 21:13:24 +0000 (06:13 +0900)
commitddbe80ce552885fc7662b6f9ed18eae63f71a005
treef8bbf3234d6e856ef720f02d022a9dd6c61e7920
parentbd5767c137713764390001a0071aed911cc7f2b4
parent166ba1350d802535b6a6ea7ea0bc29c56a71b7ec
Merge branch 'master' into single-inheritance