Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Sat, 15 Jan 2022 15:43:45 +0000 (00:43 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Sat, 15 Jan 2022 15:43:45 +0000 (00:43 +0900)
commit74e1622eadeb633e48afc185ca3afdb6d4b22978
treeb4f17e9ea32e813abaca30fd958f0141a6d650d5
parent0db4310f53458783a95df01abd59690bb6715f14
parentb180e86287c43839f064713290d4f65e8c670fff
Merge branch 'master' into single-inheritance