Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Tue, 12 Mar 2019 11:24:22 +0000 (20:24 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Tue, 12 Mar 2019 11:24:22 +0000 (20:24 +0900)
commitae630276644194b04eec3e97d35a2bc35f73b41e
tree00c1d8a2a0aa99006fd4787678635ba982fa29d7
parent60b3d7aca8926a9175cfccc5877763db4a1ff7fd
parent76e0bd76f7ab5644fb8986ccea20c992c2411edc
Merge branch 'master' into single-inheritance