Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Thu, 3 Dec 2020 10:15:34 +0000 (19:15 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Thu, 3 Dec 2020 10:15:34 +0000 (19:15 +0900)
commit93bf0f6e19a28087792d6a6ea8c7d4c135e122c7
treed6cb33a5320687289cded4e055067f9f1e2375d1
parent72c11f9a518cb3e3bf282ee58488958d34b6adb5
parent31be17ad7d6690f6ac0b487b8171707f6edfa07a
Merge branch 'master' into single-inheritance