Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Thu, 20 May 2021 23:57:41 +0000 (08:57 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Thu, 20 May 2021 23:57:41 +0000 (08:57 +0900)
commit1834371ef81ede65b025d9b737d08f5ecdbee168
tree7fd1c6b7f5556faa3d44ea1d8788b84ecce7ccca
parent568400d7e026e99daec722b56dad07a98d0a02fd
parentc4390e3eb26a79972f2fc7db6c6550a8148d45c9
Merge branch 'master' into single-inheritance