Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Tue, 10 Mar 2020 06:35:27 +0000 (15:35 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Tue, 10 Mar 2020 06:35:27 +0000 (15:35 +0900)
commit9dbc00cfe87dce91ff407b418547a984d96e112a
tree5a9c75d853aff394b0677c9e4498ee16eba5a6bb
parenta81ce08a25037e8f61aa44af2a6a7c4795481b99
parent478569b28a7fec5ce813413848f485b780a56435
Merge branch 'master' into single-inheritance