Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Tue, 14 Jul 2020 14:57:23 +0000 (23:57 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Tue, 14 Jul 2020 14:57:23 +0000 (23:57 +0900)
commit36ee878b158d2cadd531cbd0f1c4a61fd80f523c
treef29fce9d6fa286a2a219416192c9847892c8437e
parent4ca2e9b9ce04e94e705b7d01a3aef2e8d59589af
parent95cc2774e7bec3e9f46e16dccb1663cfa7486f12
Merge branch 'master' into single-inheritance