Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Tue, 23 Jun 2020 05:54:24 +0000 (14:54 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Tue, 23 Jun 2020 05:54:24 +0000 (14:54 +0900)
commit4ec7a7dfc3d96faccd0a63ccb4107d9d9899e186
treed2879898d385e69b5db3737a4a8303bd00941ee4
parent7bffa92364f9c4f526938d1cf5ea6be91af43b41
parent74fb6a2e6a08da6da77acb30274c26173ebcef01
Merge branch 'master' into single-inheritance