Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Fri, 23 Oct 2020 15:47:37 +0000 (00:47 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Fri, 23 Oct 2020 15:47:37 +0000 (00:47 +0900)
commit7ba9e38ed8cccb493e2342b529709d281588ded3
tree0a62370e2e05cb501eb3e5fdbb9fe943d0a1e01b
parent02ad3c677748acc613e354706df4d2878ce687ea
parentf9ca6d2bd0fa0bfa15d44aec456d32e1f3069dc3
Merge branch 'master' into single-inheritance