Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Wed, 19 Dec 2018 06:39:29 +0000 (15:39 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Wed, 19 Dec 2018 06:39:29 +0000 (15:39 +0900)
commit9436c5291f6b43309e026fc035d4cad954578087
tree13104bdb17f619b57096112ddcf51e553db3fb21
parentfce603cfeb9a6ca4e077fd721195a451f97951fa
parentd13f0efbca8c41680886c594db2d81b0aca0604a
Merge branch 'master' into single-inheritance