Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Fri, 31 Jan 2020 08:33:30 +0000 (17:33 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Fri, 31 Jan 2020 08:33:30 +0000 (17:33 +0900)
commita67d960bd673658a8017965ae064f6755fb68e5a
tree72d87ffdf2a2f58441e24d8dcbe308603e4f1c9a
parentb99f1fd0b9a4f0ea27205ee54099054ddf0a47cc
parent916b4efd057676ab4a3e956820ef729a7f515ddf
Merge branch 'master' into single-inheritance