Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Fri, 31 Jan 2020 01:17:44 +0000 (10:17 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Fri, 31 Jan 2020 01:17:44 +0000 (10:17 +0900)
commitb99f1fd0b9a4f0ea27205ee54099054ddf0a47cc
treece38263c4284ca81062f2f2614f0685a3c3ba4fa
parente4eca00ef22461a9cc387d995cebd374dfd3aa08
parentf17d307af0730cbb9e5243b7ba1340cddd480f0f
Merge branch 'master' into single-inheritance