Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Sun, 16 May 2021 15:10:26 +0000 (00:10 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Sun, 16 May 2021 15:10:26 +0000 (00:10 +0900)
commit717ea1e80e9f9e5c5839ad15886fdcae58e137ab
tree71c84c6c41b4285b353b46386be773691197a86d
parentca5552113214553f6b62329b1f038689736b9043
parent4be59feff5942cba5f8168108913dd2401934d05
Merge branch 'master' into single-inheritance