Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Tue, 2 Apr 2019 03:25:45 +0000 (12:25 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Tue, 2 Apr 2019 03:25:45 +0000 (12:25 +0900)
commita8e2ec40e88340202d90f1d5287b60e628aa5128
tree8e5eb8a2413c3ec769ebab755a8225cbf4635a8a
parent1f0bd91f62b208da986306588063809e833f20fb
parentee93bb1e7d6c6d646bf9747939bd9427fc767981
Merge branch 'master' into single-inheritance