Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Mon, 18 Mar 2019 01:36:22 +0000 (10:36 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Mon, 18 Mar 2019 01:36:22 +0000 (10:36 +0900)
commit0b91f9d38ac91f89a9804a17c8d76445fe737f6f
treebd7bdf84893740b6c406476e7bc5203117beab7e
parent3564003e3f7e6317f87765ad346759cd8829cc88
parent37b9f08892760b4c1558689763a093c7c143415c
Merge branch 'master' into single-inheritance