Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Wed, 12 May 2021 11:20:06 +0000 (20:20 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Wed, 12 May 2021 11:20:06 +0000 (20:20 +0900)
commitdd38e3690962107da114549160fd5584db78f6e6
tree16e36014ca1dcab087d6b874eb9c2d74d225ec82
parent3fcfc807507cd5f4bc468f6a299f423eb4c2d9a9
parent842d8c11e313a31b796650485f9686e7e3500f66
Merge branch 'master' into single-inheritance