Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Sat, 20 Feb 2021 17:21:40 +0000 (02:21 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Sat, 20 Feb 2021 17:21:40 +0000 (02:21 +0900)

Trivial merge