Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Wed, 17 Jul 2019 10:45:13 +0000 (19:45 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Wed, 17 Jul 2019 10:45:13 +0000 (19:45 +0900)
commit336a80ac995bcd8730f4443d2668631a5c87f663
tree7c0a96e2d3b8348126652a16b2fac2ee49e386ec
parentebf634b99877234c40b1e7bcc6b775a790d64a5d
parent9100ce7a960d2299d6564ca521938d7ae38badaf
Merge branch 'master' into single-inheritance