Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Fri, 2 Oct 2020 10:04:45 +0000 (19:04 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Fri, 2 Oct 2020 10:04:45 +0000 (19:04 +0900)

Trivial merge