Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Thu, 22 Oct 2020 16:14:48 +0000 (01:14 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Thu, 22 Oct 2020 16:14:48 +0000 (01:14 +0900)
commitec619e7f9616c1c035f67eca2f9fb4f640ed096f
tree15f0018a4b5cf0a0de34b594afc02b03fe61b43f
parentd4d5caffc782ed33d1172896513083338a1ec108
parentbe2a2fe09f6bee55d7d3df5e37f3b4489fb02b28
Merge branch 'master' into single-inheritance