Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Thu, 3 Dec 2020 15:11:40 +0000 (00:11 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Thu, 3 Dec 2020 15:11:40 +0000 (00:11 +0900)
commit4eaf1c8b801ca646a6d78b47105cbb6d914fbb9c
tree7b4120b9899aa02f5a6e53ecadc056812a926ce0
parent93bf0f6e19a28087792d6a6ea8c7d4c135e122c7
parent5e761aa0d66571cf73de66b3b02dc2491383c5e8
Merge branch 'master' into single-inheritance