Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Tue, 23 Mar 2021 10:11:39 +0000 (19:11 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Tue, 23 Mar 2021 10:11:39 +0000 (19:11 +0900)

Trivial merge