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)

Trivial merge