Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Thu, 19 Mar 2020 05:43:32 +0000 (14:43 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Thu, 19 Mar 2020 05:43:32 +0000 (14:43 +0900)
commita402ebce0e09d0b5453ce64510965d7494243b7d
tree692aac2960b181afac1273db25d67b181c1bab32
parent6b933a4e5a9cbef438dc53b3017e048fb5827373
parent1c3daeca45c5b1af573225300e11bf4e1c9269fa
Merge branch 'master' into single-inheritance