Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Sat, 26 Dec 2020 18:02:44 +0000 (03:02 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Sat, 26 Dec 2020 18:02:44 +0000 (03:02 +0900)
commit6e14168a8153c4fd2f6550d20f67a6280911eb65
tree038977d5b7cc04652e68e458581534d72a578b0c
parentc53d94573fa39b590a839a749c0ecfa4a7ed5d37
parente5de2f068bd4a3e94597016014e6015f347c1bf7
Merge branch 'master' into single-inheritance