Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Sun, 15 Nov 2020 07:15:45 +0000 (16:15 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Sun, 15 Nov 2020 07:15:45 +0000 (16:15 +0900)

Trivial merge