Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Tue, 24 Apr 2018 07:01:15 +0000 (16:01 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Tue, 24 Apr 2018 07:01:15 +0000 (16:01 +0900)
commite4a1a16de7a7401e123a23ca23aec74e5834a17b
tree656e2e9ca8d5a467e929eeb2b062361b1624476a
parent25de3694bb8f24b01432fd7f737c0182a5d1aa0b
parentb789f10f9aad510d2bf4ee3e3ca6b1b86341b645
Merge branch 'master' into single-inheritance