Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Sat, 30 Mar 2019 19:27:28 +0000 (04:27 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Sat, 30 Mar 2019 19:27:28 +0000 (04:27 +0900)
commit9f3256f57c3746e92552d693813360f2f8c3d6de
tree0738cf2d0b3934df4b12175bde22af9841a436a0
parentf60148db1bfad2a60d41072231c57706bfd55ccd
parentff214ecf19f56795f26700706b74a1abb2fe9ada
Merge branch 'master' into single-inheritance