Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Mon, 16 Nov 2020 08:07:07 +0000 (17:07 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Mon, 16 Nov 2020 08:07:07 +0000 (17:07 +0900)
commit7239a009d00432c667aa535b5e0850d0f9d09833
treea945ee50297ee77e2ef893d05b26d4cc022f9b17
parent8f9e1143f6e4af5ac6c5df6523d04ec94e6f6189
parentebcbd99609be9f8e3d1e86f14269be7c0f68ad07
Merge branch 'master' into single-inheritance