Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Mon, 19 Oct 2020 14:23:14 +0000 (23:23 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Mon, 19 Oct 2020 14:23:14 +0000 (23:23 +0900)
commitc8e9062b0efd47ea384f1d42982e1ae912c87eb9
tree7eb055002b4d2662858b0d0e5b76d4e249c8c888
parente2c85665472e80a83231d29a7a990531d1da24dd
parent7916cc60b88dea39e0d8380761d986837a57d6f6
Merge branch 'master' into single-inheritance