Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Wed, 4 Nov 2020 14:34:23 +0000 (23:34 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Wed, 4 Nov 2020 14:34:23 +0000 (23:34 +0900)
commit881bb2248cdd0054ecaca070b2f204137d19f90b
treee157aaf91f4364cd5482d3f945204cac9f094d5c
parent7005f10e63ff4d3a3bfc9260b10056805385ff69
parent648567d40b6eae980ba2e0747967715e9d296b4d
Merge branch 'master' into single-inheritance