Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Wed, 22 Jan 2020 05:29:10 +0000 (14:29 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Wed, 22 Jan 2020 05:29:10 +0000 (14:29 +0900)
commit8144751c337b718fd4ab6c8e9f019553292e2329
treea697bed8b7878326b29bffa012ac4978ec34ba54
parent0c01f10ba17b78ea3165cc228ce41ac42906029a
parent86aff0c396b509abc61e3d74cf1326fbb8cd1226
Merge branch 'master' into single-inheritance