Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Tue, 10 Mar 2020 14:53:01 +0000 (23:53 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Tue, 10 Mar 2020 14:53:01 +0000 (23:53 +0900)
commit9074bfec4a7fb73df54c4adfe8ca7a533301d359
tree314d26dfbbed70602c1b9eb753ea928b4b1693e0
parent9dbc00cfe87dce91ff407b418547a984d96e112a
parent259a3b55ec8776713176be9ac1cad0e3bfd1c354
Merge branch 'master' into single-inheritance