Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Thu, 24 Dec 2020 15:17:03 +0000 (00:17 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Thu, 24 Dec 2020 15:17:03 +0000 (00:17 +0900)
commitc53d94573fa39b590a839a749c0ecfa4a7ed5d37
treeae8ac13f5f4943504870c8bcb1ed35a20adf6ba7
parentf93d8374da6debd4dfc2219c0d3660c63766cca5
parentf336d4e790ee544690545d8acb90ddfa51c4003a
Merge branch 'master' into single-inheritance