Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Sun, 18 Apr 2021 14:18:25 +0000 (23:18 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Sun, 18 Apr 2021 14:18:25 +0000 (23:18 +0900)

Trivial merge