Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Tue, 20 Oct 2020 12:00:42 +0000 (21:00 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Tue, 20 Oct 2020 12:00:42 +0000 (21:00 +0900)
commita706d2c41f8584f3a69133a4435caa4883892cf6
tree428434226646164f26ba0ea0a76fa9cf7d8bbe73
parentc8e9062b0efd47ea384f1d42982e1ae912c87eb9
parent8538e3234aaaf3ea89dd7144b7632396344655fa
Merge branch 'master' into single-inheritance