Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Sat, 8 May 2021 06:34:50 +0000 (15:34 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Sat, 8 May 2021 06:34:50 +0000 (15:34 +0900)
commita8fc2c12430c8602925f933e507622c922ab3f15
tree3903ccec790a2d95d9974f188850b07aa5d0e36b
parent6e15b0723f2397a0413324a98f023ad0a8a43bee
parent6cb4ed91badc5fe35d2ff2b762fcbe069517a223
Merge branch 'master' into single-inheritance