Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Wed, 2 Oct 2019 07:38:13 +0000 (16:38 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Wed, 2 Oct 2019 07:38:13 +0000 (16:38 +0900)
commit03d4dec67d975ce24bde1259dbda6ec6dab30fe7
treeb34e82b4fcd992b67bc90a70597469514a931803
parent0d964bcccb39ad61f68ac8b7b6a5f3cf0bf2ccdc
parent2b5a35eb58e3e96da2ce943d4db0063e5238be2b
Merge branch 'master' into single-inheritance